From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 6 Nov 2015 10:53:55 +0000 (+0000)
Subject: - updated to 20151106, updated URL, package all contents using same
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=c3ba27f7813763a1824a469c5ec6ab0025445703;p=packages%2Fmunin-plugins-contrib.git

- updated to 20151106, updated URL, package all contents using same
  directory structure as provided by upstream
---

diff --git a/munin-plugins-contrib.spec b/munin-plugins-contrib.spec
index 3e753b7..86f6efb 100644
--- 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:	2
+Version:	20151106
+Release:	1
 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
@@ -53,7 +53,7 @@ znajdującym się na https://github.com/munin-monitoring/contrib/.\
 %{nil}
 
 %prep
-%setup -q -n munin-monitoring-contrib-b02fe4e
+%setup -q -n munin-monitoring-contrib-9b0c3d6
 
 find -type f -print0 | xargs -0 dos2unix
 
@@ -99,11 +99,11 @@ for i in plugins/*; do
 	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/
-		fi
+                echo $f | grep -q -E "(example|png|.gitignore)" && continue
+		n=$(echo $f | sed -e 's!'$i'/!!')
+		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