commit 56ea8670296a4eaf86c676f7f1fa04ad7387af9d
Author: Paul Howarth <paul(a)city-fan.org>
Date: Sat Aug 25 19:54:02 2012 +0100
Clean up buildreqs
- Classify buildreqs by usage
- BR: perl(Time::HiRes) for the test suite
- BR: perl(Pod::Simple) ≥ 3.14 for the release tests
- BR: at least version 0.17 of perl(Test::CPAN::Meta)
- Bump perl(Test::Pod) version requirement to 1.44
- Don't need to remove empty directories from the buildroot
PPI-1.215-UTF8.patch => PPI-1.215-utf8.patch | 6 +-
perl-PPI.spec | 60 +++++++++++++++-----------
2 files changed, 38 insertions(+), 28 deletions(-)
---
diff --git a/PPI-1.215-UTF8.patch b/PPI-1.215-utf8.patch
similarity index 88%
rename from PPI-1.215-UTF8.patch
rename to PPI-1.215-utf8.patch
index 3c22cc9..ecb7480 100644
--- a/PPI-1.215-UTF8.patch
+++ b/PPI-1.215-utf8.patch
@@ -1,6 +1,6 @@
---- PPI/Changes
-+++ PPI/Changes
-@@ -705,7 +705,7 @@
+--- Changes
++++ Changes
+@@ -705,7 +705,7 @@ Revision history for Perl extension PPI
- Resolved Lexer bug CPAN #13425 ( $p{package} creates a PPI::Statement::Package )
Added smarts to resolve word-started statements as ::Expression in subscripts
- Resolved PDOM bug CPAN #13326 ( problems in index_locations )
diff --git a/perl-PPI.spec b/perl-PPI.spec
index f60998f..287560f 100644
--- a/perl-PPI.spec
+++ b/perl-PPI.spec
@@ -7,48 +7,56 @@
Name: perl-PPI
Version: 1.215
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Parse, Analyze and Manipulate Perl
Group: Development/Libraries
License: GPL+ or Artistic
URL:
http://search.cpan.org/dist/PPI/
Source0:
http://www.cpan.org/authors/id/A/AD/ADAMK/PPI-%{version}.tar.gz
-Patch0: PPI-1.215-UTF8.patch
+Patch0: PPI-1.215-utf8.patch
BuildArch: noarch
+# =============== Module Build ======================
+BuildRequires: perl(Cwd)
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Task::Weaken)
+# =============== Module Runtime ====================
BuildRequires: perl(Carp)
-BuildRequires: perl(Class::Inspector) => 1.22
BuildRequires: perl(Clone) >= 0.30
BuildRequires: perl(constant)
-BuildRequires: perl(Cwd)
BuildRequires: perl(Digest::MD5) >= 2.35
BuildRequires: perl(Exporter)
-BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Path)
BuildRequires: perl(File::Spec) >= 0.84
-BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(IO::String) >= 1.07
-BuildRequires: perl(File::Remove) >= 1.42
-BuildRequires: perl(List::Util) >= 1.20
BuildRequires: perl(List::MoreUtils) >= 0.16
+BuildRequires: perl(List::Util) >= 1.20
BuildRequires: perl(Params::Util) >= 1.00
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Storable) >= 2.17
+# =============== Test Suite ========================
+BuildRequires: perl(Class::Inspector) >= 1.22
+BuildRequires: perl(File::Remove) >= 0.39
+BuildRequires: perl(File::Spec::Functions)
+BuildRequires: perl(File::Spec::Unix)
BuildRequires: perl(Test::More) >= 0.86
BuildRequires: perl(Test::NoWarnings) >= 0.084
BuildRequires: perl(Test::Object) >= 0.07
BuildRequires: perl(Test::SubCalls) >= 1.07
-BuildRequires: perl(Task::Weaken)
+BuildRequires: perl(Time::HiRes)
+# =============== Release Tests =====================
# Circular dependencies in release tests, so don't do them when bootstrapping:
# Perl::MinimumVersion -> PPI
%if 0%{!?perl_bootstrap:1}
BuildRequires: perl(File::Find::Rule) >= 0.32
BuildRequires: perl(File::Find::Rule::Perl) >= 1.09
BuildRequires: perl(Perl::MinimumVersion) >= 1.20
+BuildRequires: perl(Pod::Simple) >= 3.14
BuildRequires: perl(Test::ClassAPI) >= 1.03
-BuildRequires: perl(Test::CPAN::Meta)
+BuildRequires: perl(Test::CPAN::Meta) >= 0.17
BuildRequires: perl(Test::MinimumVersion) >= 0.101080
-BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::Pod) >= 1.44
%endif
+# =============== Module Runtime ====================
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo
$version))
%if %{with XSAccessor}
Requires: perl(Class::XSAccessor)
@@ -62,12 +70,11 @@ Requires: perl(Task::Weaken)
%description
Parse, analyze and manipulate Perl (without perl).
-
%prep
%setup -q -n PPI-%{version}
-# Re-code docs as UTF-8
-%patch0 -p1
+# Recode documentation as UTF-8
+%patch0
%if %{without XSAccessor}
rm lib/PPI/XSAccessor.pm
@@ -78,44 +85,47 @@ sed -i '/^lib\/PPI\/XSAccessor\.pm$/d' MANIFEST
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
-
%install
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
%{_fixperms} %{buildroot}
-
%check
make test
%if 0%{!?perl_bootstrap:1}
make test TEST_FILES="xt/*.t" RELEASE_TESTING=1
%endif
-
%files
%doc Changes LICENSE README inline2test.conf inline2test.tpl
%{perl_vendorlib}/PPI/
%{perl_vendorlib}/PPI.pm
%{_mandir}/man3/PPI*.3pm*
-
%changelog
+* Sat Aug 25 2012 Paul Howarth <paul(a)city-fan.org> - 1.215-9
+- classify buildreqs by usage
+- BR: perl(Time::HiRes) for the test suite
+- BR: perl(Pod::Simple) ≥ 3.14 for the release tests
+- BR: at least version 0.17 of perl(Test::CPAN::Meta)
+- bump perl(Test::Pod) version requirement to 1.44
+- don't need to remove empty directories from the buildroot
+
* Thu Aug 16 2012 Petr Pisar <ppisar(a)redhat.com> - 1.215-8
-- Specify all dependencies
+- specify all dependencies
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.215-7
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+- rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Jul 10 2012 Petr Pisar <ppisar(a)redhat.com> - 1.215-6
-- Perl 5.16 re-rebuild of bootstrapped packages
+- perl 5.16 re-rebuild of bootstrapped packages
* Tue Jun 19 2012 Petr Pisar <ppisar(a)redhat.com> - 1.215-5
-- Perl 5.16 rebuild
-- Build-require Class::Inspector for tests
+- perl 5.16 rebuild
+- build-require Class::Inspector for tests
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.215-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Thu Jul 21 2011 Paul Howarth <paul(a)city-fan.org> - 1.215-3
- always run test suite but don't run release tests when bootstrapping