commit cc75fdef348f35d45b0d872e9badaf5e6e369edf
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Apr 14 09:43:29 2011 +0100
Tweak provides filter to work with rpm >= 4.9 too
perl-UNIVERSAL-require.spec | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/perl-UNIVERSAL-require.spec b/perl-UNIVERSAL-require.spec
index dc43f3b..d774b53 100644
--- a/perl-UNIVERSAL-require.spec
+++ b/perl-UNIVERSAL-require.spec
@@ -1,6 +1,6 @@
Name: perl-UNIVERSAL-require
Version: 0.13
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Require() modules from a variable
Group: Development/Libraries
License: GPL+ or Artistic
@@ -11,19 +11,18 @@ BuildArch: noarch
BuildRequires: perl(Test::More)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Filter bogus provide for perl(UNIVERSAL) (rpm 4.9 onwards)
+%global __provides_exclude ^perl\\(UNIVERSAL\\)
+
%description
%{summary}.
%prep
%setup -q -n UNIVERSAL-require-%{version}
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
- sed -e '/^perl(UNIVERSAL)$/d'
-EOF
-%define __perl_provides %{_builddir}/UNIVERSAL-require-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
+# Filter bogus provide for perl(UNIVERSAL) (prior to rpm 4.9)
+%global provfilt /bin/sh -c "%{__perl_provides} | sed -e '/^perl(UNIVERSAL)$/d'"
+%define __perl_provides %{provfilt}
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -50,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Apr 14 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.13-6
+- Tweak provides filter to work with rpm >= 4.9 too
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
