From ddf96d208ee1652ac2ca0574d1bf77d2dfea7beb Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 19 Apr 2016 15:45:44 +0100 Subject: [PATCH] Fix FTBFS due to missing buildreq perl-devel - Classify buildreqs by usage - Use %license where possible - Simplify find commands using -empty and -delete --- perl-Package-Stash-XS.spec | 68 +++++++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec index 714d9cd..2fd4b46 100644 --- a/perl-Package-Stash-XS.spec +++ b/perl-Package-Stash-XS.spec @@ -1,6 +1,6 @@ Name: perl-Package-Stash-XS Version: 0.28 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Faster and more correct implementation of the Package::Stash API Group: Development/Libraries License: GPL+ or Artistic @@ -8,32 +8,50 @@ URL: http://search.cpan.org/dist/Package-Stash-XS/ Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-%{version}.tar.gz Patch1: Package-Stash-XS-0.27-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) +# Module Build +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: gcc +BuildRequires: make BuildRequires: perl >= 3:5.8.1 +%if "%{?rhel}" != "5" +BuildRequires: perl-devel +%endif +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 +# Module Runtime +BuildRequires: perl(strict) +BuildRequires: perl(warnings) +BuildRequires: perl(XSLoader) +# Test Suite +BuildRequires: perl(B) BuildRequires: perl(base) BuildRequires: perl(constant) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(File::Find) BuildRequires: perl(File::Temp) BuildRequires: perl(lib) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(Symbol) +BuildRequires: perl(Test::Fatal) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Requires) +# Optional Tests %if %(perl -e 'print $] >= 5.014 ? 1 : 0;') BuildRequires: perl(Package::Anon) %endif -BuildRequires: perl(Pod::Coverage::TrustPod) -BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Test::EOL) -BuildRequires: perl(Test::Fatal) -%if ! (0%{?rhel} >= 7) -BuildRequires: perl(Test::LeakTrace) -%endif -BuildRequires: perl(Test::More) -BuildRequires: perl(Test::NoTabs) -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) -BuildRequires: perl(Test::Requires) -# No Variable::Magic in EPEL-5 %if "%{?rhel}" != "5" BuildRequires: perl(Variable::Magic) %endif -BuildRequires: perl(XSLoader) +# Author Tests +%if ! (0%{?rhel} >= 7) +BuildRequires: perl(Test::LeakTrace) +%endif +# Release Tests +BuildRequires: perl(Pod::Coverage::TrustPod) +BuildRequires: perl(Test::EOL) +BuildRequires: perl(Test::NoTabs) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(Test::Pod::Coverage) +# Dependencies Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # Don't "provide" private Perl libs @@ -59,8 +77,8 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find %{buildroot} -type f -name .packlist -delete +find %{buildroot} -type f -name '*.bs' -a -empty -delete %{_fixperms} %{buildroot} %check @@ -75,12 +93,22 @@ make test TEST_FILES="$(echo $(find xt/release/ -name '*.t'))" rm -rf %{buildroot} %files -%doc Changes LICENSE README +%if 0%{?_licensedir:1} +%license LICENSE +%else +%doc LICENSE +%endif +%doc Changes README %{perl_vendorarch}/auto/Package/ %{perl_vendorarch}/Package/ -%{_mandir}/man3/Package::Stash::XS.3pm* +%{_mandir}/man3/Package::Stash::XS.3* %changelog +* Tue Apr 19 2016 Paul Howarth - 0.28-10 +- Classify buildreqs by usage +- Use %%license where possible +- Simplify find commands using -empty and -delete + * Thu Feb 04 2016 Fedora Release Engineering - 0.28-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild