commit d8d9392c5a9a53ba68c8e601509de89a1f62b45d Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Wed Oct 17 14:58:30 2012 +0100 Spec clean-up - BR:/R: perl(Carp) - BR: perl(constant), perl(Exporter) and perl(ExtUtils::CBuilder) - Add commentary regarding non-use of Test::LeakTrace for EL-7 builds - Use Test::LeakTrace for EL-5 builds - Drop support for EL-4 builds since it was EOL-ed ages ago - Drop %defattr, redundant since rpm 4.4 - Don't need to remove empty directories from the buildroot - Remove more command macros perl-List-MoreUtils.spec | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) --- diff --git a/perl-List-MoreUtils.spec b/perl-List-MoreUtils.spec index 7159622..d95c06a 100644 --- a/perl-List-MoreUtils.spec +++ b/perl-List-MoreUtils.spec @@ -1,34 +1,40 @@ Name: perl-List-MoreUtils Version: 0.33 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Provide the stuff missing in List::Util Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/List-MoreUtils/ Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) +BuildRequires: perl(Carp) +BuildRequires: perl(constant) +BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::CBuilder) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Pod::Simple) BuildRequires: perl(Test::CPAN::Meta) -%if "%{rhel}" != "4" && "%{rhel}" != "5" && "%{rhel}" != "7" +# For EL-7 onwards, this package is imported to RHEL, where Test::LeakTrace in EPEL isn't available +%if 0%{?rhel} < 7 BuildRequires: perl(Test::LeakTrace) +%endif # Test::MinimumVersion -> Perl::MinimumVersion -> PPI -> List::MoreUtils %if 0%{!?perl_bootstrap:1} BuildRequires: perl(Test::MinimumVersion) %endif -%endif BuildRequires: perl(Test::More) >= 0.42 BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Carp) # Don't "provide" private Perl libs -%{?perl_default_filter} - -%if 0%{?rhel} < 6 +%if 0%{?rhel}%{?fedora} < 6 %global _use_internal_dependency_generator 0 -%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | /bin/sort -u -%global __find_provides /bin/sh -c "%{__grep} -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" +%global __deploop() while read FILE; do /usr/lib/rpm/rpmdeps -%{1} ${FILE}; done | sort -u +%global __find_provides /bin/sh -c "grep -v '%{perl_vendorarch}/.*\\.so$' | %{__deploop P}" %global __find_requires /bin/sh -c "%{__deploop R}" +%else +%{?perl_default_filter} %endif %description @@ -47,7 +53,6 @@ rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' -find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null %{_fixperms} %{buildroot} %check @@ -58,18 +63,27 @@ make test TEST_FILES="xt/*.t" AUTOMATED_TESTING=1 rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc Changes README LICENSE %{perl_vendorarch}/List/ %{perl_vendorarch}/auto/List/ %{_mandir}/man3/List::MoreUtils.3pm* %changelog +* Wed Oct 17 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 0.33-7 +- BR:/R: perl(Carp) +- BR: perl(constant), perl(Exporter) and perl(ExtUtils::CBuilder) +- Add commentary regarding non-use of Test::LeakTrace for EL-7 builds +- Use Test::LeakTrace for EL-5 builds +- Drop support for EL-4 builds since it was EOL-ed ages ago +- Drop %%defattr, redundant since rpm 4.4 +- Don't need to remove empty directories from the buildroot +- Remove more command macros + * Mon Oct 15 2012 Petr Pisar <ppisar@xxxxxxxxxx> - 0.33-6 - Do not build-require Test::LeakTrace on RHEL 7 * Fri Jul 27 2012 Tom Callaway <spot@xxxxxxxxxxxxxxxxx> - 0.33-5 -- add epel filtering mechanism +- Add epel filtering mechanism * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_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