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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



commit 3d5635661ec9c98358fd42ad87014b7eb3586266
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date:   Tue Apr 19 13:03:55 2011 +0100

    Make the provides filter work with rpm 4.9 too

 Spiffy-filter-provides.sh |    3 ---
 perl-Spiffy.spec          |   25 ++++++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/perl-Spiffy.spec b/perl-Spiffy.spec
index 416722c..dc6d610 100644
--- a/perl-Spiffy.spec
+++ b/perl-Spiffy.spec
@@ -1,6 +1,6 @@
 Name:           perl-Spiffy
 Version:        0.30
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Framework for doing object oriented (OO) programming in Perl
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -12,9 +12,12 @@ BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-Source99:      Spiffy-filter-provides.sh
-%global real_perl_provides %{__perl_provides}
-%define __perl_provides %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-provides
+# 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
 "Spiffy" is a framework and methodology for doing object oriented (OO)
@@ -26,9 +29,6 @@ straightforward and (perhaps someday) standard way.
 %prep
 %setup -q -n Spiffy-%{version}
 
-sed -e 's,@@PERL_PROV@@,%{real_perl_provides},' %{SOURCE99} > %{__perl_provides}
-chmod +x %{__perl_provides}
-
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -47,20 +47,23 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 %clean
-rm -rf $RPM_BUILD_ROOT %{__perl_provides}
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/Spiffy.pm
+%{_mandir}/man3/Spiffy.3pm*
 
 %changelog
+* Tue Apr 19 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.30-16
+- Make the provides filter work with rpm 4.9 too
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.30-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Wed Dec 22 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 0.30-14
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Thu May 06 2010 Marcela Maslanova <mmaslano@xxxxxxxxxx> - 0.30-13
 - Mass rebuild with perl-5.12.0
--
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


[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Legacy Announce]     [Fedora PHP Devel]     [Kernel Devel]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Big List of Linux Books]     [Gimp]     [Yosemite Information]
  Powered by Linux