From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 17 Oct 2015 13:19:52 +0000 (+0000)
Subject: - drop trailing underscore in package names for wildcard plugins
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=f27a83ceeb9de93350f41cd3184f5b49c380346e;p=packages%2Fmunin-plugins-contrib.git

- drop trailing underscore in package names for wildcard plugins
---

diff --git a/munin-plugins-contrib.spec b/munin-plugins-contrib.spec
index 8fa20b2..3e753b7 100644
--- a/munin-plugins-contrib.spec
+++ b/munin-plugins-contrib.spec
@@ -3,7 +3,7 @@ Summary:	3rd-party Munin plugins
 Summary(pl.UTF-8):	Nieoficjalne wtyczki munina
 Name:		munin-plugins-contrib
 Version:	20151014
-Release:	1
+Release:	2
 License:	GPL
 Group:		Daemons
 Source0:	https://github.com/munin-monitoring/contrib/tarball/master/%{name}.tar.gz
@@ -34,21 +34,21 @@ Ten pakiet zawera nieoficjalne wtyczki dla Munina z repozytorium contrib,
 znajdującym się na https://github.com/munin-monitoring/contrib/.
 
 %define	contrib_package()\
-%package %1\
-Summary:	3rd-party Munin plugin - %1\
-Summary(pl.UTF-8):	Nieoficjalna wtyczka dla munina - %1\
+%package %{1}\
+Summary:	3rd-party Munin plugin - %{1}\
+Summary(pl.UTF-8):	Nieoficjalna wtyczka dla munina - %{1}\
 Group:		Daemons\
 Requires:	munin-node\
 \
-%description %1\
+%description %{1}\
 This package contains 3rd-party plugins for Munin from contrib repository\
 located at https://github.com/munin-monitoring/contrib/.\
 \
-%description %1 -l pl.UTF-8\
+%description %{1} -l pl.UTF-8\
 Ten pakiet zawera nieoficjalne wtyczki dla Munina z repozytorium contrib,\
 znajdującym się na https://github.com/munin-monitoring/contrib/.\
 \
-%files %1 -f %1.list\
+%files %{1} -f %{1}.list\
 %defattr(755,root,root,755)\
 %{nil}
 
@@ -96,7 +96,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/munin/plugins/
 
 for i in plugins/*; do
 	[ -d $i ] || continue
-	j=$(basename $i)
+	j=$(basename $i | sed -e 's/_$//')
 	>$j.list
 	find $i/* -type f | while read f ; do
 		if file $f | grep -qs script ; then
@@ -168,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %contrib_package http
 %contrib_package ipvs
 %contrib_package java
-%contrib_package jchkmail_counters_
+%contrib_package jchkmail_counters
 %contrib_package jenkins
 %contrib_package joomla
 %contrib_package kamailio