summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-08-06 09:17:28 +0200
committerRemi Collet <fedora@famillecollet.com>2011-08-06 09:17:28 +0200
commita6849521e0c65d98408860fe91252593491a4d99 (patch)
tree6f6f9dbf6247550e4feee1c85bcdc8d199efdcd9
parent04c8abc40d41a796e45f9ef2bc97eb02f66c93a5 (diff)
perl-FusionInventory-Agent-Task-OcsDeploy: adapt filter for fedora 16HEADmaster
-rw-r--r--perl-FusionInventory-Agent-Task-OcsDeploy.spec18
1 files changed, 9 insertions, 9 deletions
diff --git a/perl-FusionInventory-Agent-Task-OcsDeploy.spec b/perl-FusionInventory-Agent-Task-OcsDeploy.spec
index 5e5e0dd..5d6de8b 100644
--- a/perl-FusionInventory-Agent-Task-OcsDeploy.spec
+++ b/perl-FusionInventory-Agent-Task-OcsDeploy.spec
@@ -1,6 +1,6 @@
Name: perl-FusionInventory-Agent-Task-OcsDeploy
Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: OCS Inventory NG Software deployment support for FusionInventory Agent
Summary(fr): Gestion du déploiement logiciel OCS Inventory NG avec FusionInventory
License: GPLv2+
@@ -27,15 +27,11 @@ Requires: perl(POE::Component::Client::HTTP)
%endif
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-# This work only on recent fedora - But only lates rpm detect this
-%{?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
@@ -52,6 +48,7 @@ déploiement de logiciel envoyés par un serveur OCS Inventory NG.
%setup -q -n FusionInventory-Agent-Task-OcsDeploy-%{version}
# Filtering auto Requires detection
+# Only used for old fedora and RHEL version
cat <<EOF | tee %{name}-req
#!/bin/sh
%{__perl_requires} $* | \
@@ -100,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 06 2011 Remi Collet <remi@fedoraproject.org> - 1.1.0-3
+- adapt filter
+
* Fri May 13 2011 Remi Collet <Fedora@famillecollet.com> - 1.1.0-2
- fix f15 build (filter perl(Win32::OLE) dependency)