- package subdirs too

[packages/munin-plugins-contrib.git] / munin-plugins-contrib.spec

diff --git a/munin-plugins-contrib.spec b/munin-plugins-contrib.spec
index 8fa20b268801d7f9e8357411d2f01ad4eab06e94..23924a7f165fe6dbd63b75a6bf78772e8de962c9 100644 (file)
--- a/munin-plugins-contrib.spec
+++ b/munin-plugins-contrib.spec
@@ -2,19 +2,19 @@
 Summary:       3rd-party Munin plugins
 Summary(pl.UTF-8):     Nieoficjalne wtyczki munina
 Name:          munin-plugins-contrib
-Version:       20151014
-Release:       1
+Version:       20151106
+Release:       2
 License:       GPL
 Group:         Daemons
-Source0:       https://github.com/munin-monitoring/contrib/tarball/master/%{name}.tar.gz
-# Source0-md5: 6b38950e7b41c8c75fe4b0803ffe1261
+Source0:       https://github.com/munin-monitoring/contrib/tarball/master/%{name}-%{version}.tar.gz
+# Source0-md5: 83224891edadc51b526751ecdc7258e7
 Patch0:                %{name}-postfix.patch
 Patch1:                %{name}-other.patch
 Patch2:                %{name}-php.patch
 Patch3:                %{name}-apache.patch
 Patch4:                %{name}-passenger.patch
 Patch5:                xen.patch
-URL:           http://exchange.munin-monitoring.org/
+URL:           https://github.com/munin-monitoring/contrib/
 BuildRequires: dos2unix
 BuildRequires: perl-devel
 BuildRequires: rpm-perlprov
@@ -34,26 +34,26 @@ 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}
 
 %prep
-%setup -q -n munin-monitoring-contrib-b02fe4e
+%setup -q -n munin-monitoring-contrib-9b0c3d6
 
 find -type f -print0 | xargs -0 dos2unix
 
@@ -96,14 +96,20 @@ 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
-                       ff=$(basename $f)
-                       echo "%{_datadir}/munin/plugins/$ff" >>$j.list
-                       install -p $f $RPM_BUILD_ROOT%{_datadir}/munin/plugins/
+                echo $f | grep -q -E "(example|png|.gitignore)" && continue
+               n=$(echo $f | sed -e 's!'$i'/!!')
+               d=$(dirname $n)
+               if [ "$d" != "%{_datadir}/munin/plugins" ]; then
+                       if ! test -d $RPM_BUILD_ROOT%{_datadir}/munin/plugins/$d; then
+                               echo "%dir %{_datadir}/munin/plugins/$d" >>$j.list
+                               install -d $RPM_BUILD_ROOT%{_datadir}/munin/plugins/$d
+                       fi
                fi
+               echo "%{_datadir}/munin/plugins/$n" >>$j.list
+               install -p $f $RPM_BUILD_ROOT%{_datadir}/munin/plugins/$n
        done
 done
 
@@ -168,7 +174,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