[perl-Devel-SmallProf] Make the provides filter work with rpm 4.9 too

Paul Howarth pghmcfc at fedoraproject.org
Tue Apr 19 11:03:43 UTC 2011


commit 52cb4c3a2dac06dab8f8a5af1e865b095602428f
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Apr 19 12:03:13 2011 +0100

    Make the provides filter work with rpm 4.9 too

 perl-Devel-SmallProf.spec |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/perl-Devel-SmallProf.spec b/perl-Devel-SmallProf.spec
index 19c0689..7f3c617 100644
--- a/perl-Devel-SmallProf.spec
+++ b/perl-Devel-SmallProf.spec
@@ -1,6 +1,6 @@
 Name:           perl-Devel-SmallProf
 Version:        2.02
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Per-line Perl profiler
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -13,6 +13,13 @@ BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Time::HiRes)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+# Filter bogus provide of perl(DB) (rpm < 4.9)
+%global provfilt /bin/sh -c "%{__perl_provides} | sed -e '/perl(DB)/d'"
+%define __perl_provides %{provfilt}
+
+# Equivalent filter for rpm 4.9 onwards
+%global __provides_exclude ^perl\\(DB\\)
+
 %description
 The Devel::SmallProf profiler is focused on the time taken for a program
 run on a line-by-line basis. It is intended to be as "small" in terms of
@@ -24,15 +31,6 @@ and also in terms of being simple to use.
 
 iconv -f iso8859-1 -t utf-8 README >README.conv && mv -f README.conv README
 
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* |\
-sed -e '/perl(DB)/d'
-EOF
-
-%define __perl_provides %{_builddir}/Devel-SmallProf-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -57,15 +55,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc Changes README TODO
-%{perl_vendorlib}/*
+%{perl_vendorlib}/Devel/
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 19 2011 Paul Howarth <paul at city-fan.org> - 2.02-10
+- Make the provides filter work with rpm 4.9 too
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.02-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Thu Dec 16 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.02-8
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Fri Apr 30 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.02-7
 - Mass rebuild with perl-5.12.0


More information about the scm-commits mailing list