diff --git a/perl-Class-C3.spec b/perl-Class-C3.spec index e8278c0..dd3d69d 100644 --- a/perl-Class-C3.spec +++ b/perl-Class-C3.spec @@ -1,9 +1,6 @@ -# Provides/Requires filtering is different from rpm 4.9 onwards -%global rpm49 %(rpm --version | perl -p -e 's/^.* (\\d+)\\.(\\d+).*/sprintf("%d.%03d",$1,$2) ge 4.009 ? 1 : 0/e') - Name: perl-Class-C3 Version: 0.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Pragma to use the C3 method resolution order algorithm License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-C3/ @@ -14,13 +11,13 @@ BuildRequires: coreutils BuildRequires: findutils BuildRequires: make BuildRequires: perl >= 4:5.9.5 -BuildRequires: perl(ExtUtils::MakeMaker) # Build (dependencies of bundled ExtUtils::HasCompiler) BuildRequires: perl(base) BuildRequires: perl(Carp) BuildRequires: perl(Config) BuildRequires: perl(DynaLoader) BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec::Functions) BuildRequires: perl(File::Temp) @@ -49,10 +46,6 @@ Requires: perl(Scalar::Util) >= 1.10 # Let people "use c3;" Provides: perl(c3) = %{version} -# Filter out bogus dependencies and provides (rpm 4.9 onwards) -%global __requires_exclude ^perl\\((c3|base)\\) -%global __provides_exclude ^perl\\(t::lib:: - %description This is a pragma to change Perl 5's standard method resolution order from depth-first left-to-right (a.k.a - pre-order) to the more sophisticated C3 @@ -61,14 +54,6 @@ method resolution order. %prep %setup -q -n Class-C3-%{version} -# Filter out bogus dependencies and provides (prior to rpm 4.9) -%if ! %{rpm49} -%global reqfilt /bin/sh -c "%{__perl_requires} | grep -Evx 'perl[(](c3|base)[)]'" -%define __perl_requires %{reqfilt} -%global provfilt /bin/sh -c "%{__perl_provides} | grep -v '^perl(t::lib::'" -%define __perl_provides %{provfilt} -%endif - %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -83,13 +68,17 @@ cp -p opt/c3.pm %{buildroot}%{perl_vendorlib}/ make test %files -%doc Changes README t/ +%doc Changes README %{perl_vendorlib}/c3.pm %{perl_vendorlib}/Class/ %{_mandir}/man3/Class::C3.3* %{_mandir}/man3/Class::C3::next.3* %changelog +* Fri Jan 29 2016 Paul Howarth - 0.30-2 +- Don't ship the tests +- Drop requires/provides filters, only needed due to shipping tests + * Mon Oct 19 2015 Paul Howarth - 0.30-1 - Update to 0.30 - Update compiler detection to use ExtUtils::HasCompiler