[fusioninventory-agent] adapt filter

Remi Collet remi at fedoraproject.org
Sat Aug 6 07:07:41 UTC 2011


commit b61748dab991fad59975cb6cd527b9d8318e3c66
Author: remi <fedora at famillecollet.com>
Date:   Sat Aug 6 09:07:26 2011 +0200

    adapt filter

 fusioninventory-agent.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/fusioninventory-agent.spec b/fusioninventory-agent.spec
index 6daa873..517a63e 100644
--- a/fusioninventory-agent.spec
+++ b/fusioninventory-agent.spec
@@ -15,7 +15,7 @@ Release:   0.1.git%{gitver}%{?dist}
 # From http://github.com/fusinv/fusioninventory-agent/tarball/master
 Source0:   fusinv-fusioninventory-agent-2.1.8-95-g9bd1238.tar.gz
 %else
-Release:   2%{?dist}
+Release:   3%{?dist}
 Source0:   http://search.cpan.org/CPAN/authors/id/F/FU/FUSINV/FusionInventory-Agent-%{version}%{?prever}.tar.gz
 %endif
 
@@ -50,15 +50,11 @@ Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
 
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-# This work only on recent fedora
-%{?filter_setup:
-%filter_from_requires /perl(Win32/d
-%?perl_default_filter
-}
-%else 
+# RPM 4.8
+%{?filter_from_requires: %filter_from_requires /perl(Win32/d}
 %{?perl_default_filter}
-%endif
+# RPM 4.9
+%global __requires_exclude %{?__requires_exclude:__requires_exclude|}^perl\\(Win32
 
 
 %description
@@ -280,6 +276,9 @@ exit 0
 
 
 %changelog
+* Sat Aug 06 2011 Remi Collet <remi at fedoraproject.org> - 2.1.9-3
+- adapt filter
+
 * Fri Jul 25 2011 Petr Sabata <contyk at redhat.com> - 2.1.9-2
 - Perl mass rebuild
 


More information about the scm-commits mailing list