X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=munin-plugins-contrib.spec;h=0061dbc0c5386e2c3d970e4edf39ecfac4bd13bd;hb=d50a79dc9c2999e07f25a3f53686f05305cc26bb;hp=86f6efbc14095ef881d4ceb4c662141cb52a2e0b;hpb=c3ba27f7813763a1824a469c5ec6ab0025445703;p=packages%2Fmunin-plugins-contrib.git

diff --git a/munin-plugins-contrib.spec b/munin-plugins-contrib.spec
index 86f6efb..0061dbc 100644
--- a/munin-plugins-contrib.spec
+++ b/munin-plugins-contrib.spec
@@ -2,12 +2,12 @@
 Summary:	3rd-party Munin plugins
 Summary(pl.UTF-8):	Nieoficjalne wtyczki munina
 Name:		munin-plugins-contrib
-Version:	20151106
+Version:	20160322
 Release:	1
 License:	GPL
 Group:		Daemons
 Source0:	https://github.com/munin-monitoring/contrib/tarball/master/%{name}-%{version}.tar.gz
-# Source0-md5:	83224891edadc51b526751ecdc7258e7
+# Source0-md5:	43c3331de9ffd87c1590374b0815468c
 Patch0:		%{name}-postfix.patch
 Patch1:		%{name}-other.patch
 Patch2:		%{name}-php.patch
@@ -53,7 +53,7 @@ znajdującym się na https://github.com/munin-monitoring/contrib/.\
 %{nil}
 
 %prep
-%setup -q -n munin-monitoring-contrib-9b0c3d6
+%setup -q -n munin-monitoring-contrib-0ecf76c
 
 find -type f -print0 | xargs -0 dos2unix
 
@@ -101,8 +101,14 @@ for i in plugins/*; do
 	find $i/* -type f | while read f ; do
                 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 -d $RPM_BUILD_ROOT%{_datadir}/munin/plugins/$(dirname $n)
 		install -p $f $RPM_BUILD_ROOT%{_datadir}/munin/plugins/$n
 	done
 done
@@ -121,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %contrib_package backup
 %contrib_package backuppc
 %contrib_package bacula
+%contrib_package balanceng
 %contrib_package beboxsync
 %contrib_package bind9
 %contrib_package bitcoin
@@ -138,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %contrib_package db2
 %contrib_package disk
 %contrib_package djabberd
+%contrib_package docker
 %contrib_package dovecot
 %contrib_package drbd
 %contrib_package drupal