[smokeping] Fix perl filtering

terjeros terjeros at fedoraproject.org
Thu Feb 9 19:47:31 UTC 2012


commit 87b4e1a99ae91974a8969ea71d92f9687fcbea45
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Feb 9 20:47:28 2012 +0100

    Fix perl filtering

 smokeping.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/smokeping.spec b/smokeping.spec
index 27493f8..6f05ff5 100644
--- a/smokeping.spec
+++ b/smokeping.spec
@@ -1,13 +1,13 @@
-%global _use_internal_dependency_generator 0
-
-%global __find_requires sh -c "/usr/lib/rpm/find-requires | %{__sed} -r -e '/Authen::(Radius|Tacas)*/d; /Net::OpenSSH/d;  /Smokeping/d; '"
-
-%global __find_provides sh -c "sed -e '\\#/usr/share/smokeping#d' | /usr/lib/rpm/find-provides"
+%{?filter_setup:
+%filter_provides_in %{_datadir}/%{name}/
+%filter_from_requires /perl(Authen::.*)/d; /perl(Net::OpenSSH)/d; /Smokeping/d
+%filter_setup
+}
 
 Summary:          Latency Logging and Graphing System
 Name:             smokeping
 Version:          2.6.7
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPLv2+
 Group:            Applications/Internet
 URL:              http://oss.oetiker.ch/smokeping/
@@ -67,9 +67,7 @@ touch -r CHANGES CHANGES.utf8
 %{__mv} CHANGES.utf8 CHANGES
 
 # remove some external modules
-%{__rm} -rf lib/{CGI,Config,Digest,JSON}
-%{__rm} -rf lib/{SNMP_Session,SNMP_util,BER,JSON}.pm
-%{__rm} -f  lib/Qooxdoo/JSONRPC.pm
+%{__rm} -f lib/{SNMP_Session,SNMP_util,BER}.pm
 
 %build
 autoreconf
@@ -98,6 +96,7 @@ done
 mv %{buildroot}%{_sysconfdir}/%{name}/examples __examples
 mv %{buildroot}%{_bindir}/%{name}_cgi %{buildroot}%{_datadir}/%{name}/cgi
 %{__ln_s} %{name}_cgi %{buildroot}%{_datadir}/%{name}/cgi/%{name}.fcgi
+rm -f %{buildroot}%{_datadir}/%{name}/htdocs/smokeping.fcgi.dist
 
 %post
 if [ $1 -eq 1 ] ; then 
@@ -156,6 +155,9 @@ fi
 %{_mandir}/man7/%{name}_*.7*
 
 %changelog
+* Thu Feb 09 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.6.7-2
+- Fix perl filtering
+
 * Sun Feb 05 2012 Terje Rosten <terje.rosten at ntnu.no> - 2.6.7-1
 - Switch to mod_fcgid as default
 - Refresh patchset


More information about the scm-commits mailing list