commit 87e8b7859f8555d78801a45184147ed799bf46b2 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Mon Jul 8 13:59:48 2013 +0100 Update to 1.105 - New upstream release 1.105 - Repackage, update bug tracker - Drop pod tests - Add patch to support building with Test::More < 0.88 - Classify buildreqs by usage - Explicitly run the extra tests Package-Generator-1.105-old-Test::More.patch | 44 +++++++++++++++++++++++ perl-Package-Generator.spec | 48 ++++++++++++++++--------- sources | 2 +- 3 files changed, 76 insertions(+), 18 deletions(-) --- diff --git a/Package-Generator-1.105-old-Test::More.patch b/Package-Generator-1.105-old-Test::More.patch new file mode 100644 index 0000000..5c9c219 --- /dev/null +++ b/Package-Generator-1.105-old-Test::More.patch @@ -0,0 +1,44 @@ +--- t/000-report-versions-tiny.t ++++ t/000-report-versions-tiny.t +@@ -1,12 +1,7 @@ + use strict; + use warnings; +-use Test::More 0.88; +-# This is a relatively nice way to avoid Test::NoWarnings breaking our +-# expectations by adding extra tests, without using no_plan. It also helps +-# avoid any other test module that feels introducing random tests, or even +-# test plans, is a nice idea. ++use Test::More tests => 1; + our $success = 0; +-END { $success && done_testing; } + + # List our own version used to generate this + my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.08\n"; +@@ -54,7 +49,7 @@ eval { $v .= pmver('File::Find','any ver + eval { $v .= pmver('File::Temp','any version') }; + eval { $v .= pmver('Scalar::Util','any version') }; + eval { $v .= pmver('Symbol','any version') }; +-eval { $v .= pmver('Test::More','0.96') }; ++eval { $v .= pmver('Test::More','0.47') }; + eval { $v .= pmver('Test::Pod','1.41') }; + eval { $v .= pmver('strict','any version') }; + eval { $v .= pmver('version','0.9901') }; +--- xt/release/changes_has_content.t ++++ xt/release/changes_has_content.t +@@ -2,7 +2,6 @@ + + use Test::More tests => 2; + +-note 'Checking Changes'; + my $changes_file = 'Changes'; + my $newver = '1.105'; + my $trial_token = '-TRIAL'; +@@ -14,8 +13,6 @@ SKIP: { + ok(_get_changes($newver), "$changes_file has content for $newver"); + } + +-done_testing; +- + # _get_changes copied and adapted from Dist::Zilla::Plugin::Git::Commit + # by Jerome Quelin + sub _get_changes diff --git a/perl-Package-Generator.spec b/perl-Package-Generator.spec index 7a64719..a9dc31a 100644 --- a/perl-Package-Generator.spec +++ b/perl-Package-Generator.spec @@ -1,30 +1,30 @@ +# We need to patch the test suite if we have an old version of Test::More +%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) + Name: perl-Package-Generator -Version: 0.103 -Release: 15%{?dist} +Version: 1.105 +Release: 1%{?dist} Summary: Generate new packages quickly and easily License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Package-Generator/ Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Package-Generator-%{version}.tar.gz +Patch1: Package-Generator-1.105-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch +# Module Build +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 +# Module BuildRequires: perl(Carp) -BuildRequires: perl(Cwd) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(File::Path) -BuildRequires: perl(File::Spec) -BuildRequires: perl(Params::Util) BuildRequires: perl(Scalar::Util) -BuildRequires: perl(Symbol) -BuildRequires: perl(Test::More) -# Test::Perl::Critic -> Perl::Critic -> Exception::Class -> Test::EOL -> -# Pod::Coverage::TrustPod -> Pod::Eventual -> Mixin::Linewise -> -# Sub::Exporter -> Package::Generator -%if 0%{!?perl_bootstrap:1} -BuildRequires: perl(Test::Perl::Critic) -%endif +# Test Suite +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Temp) +BuildRequires: perl(Params::Util) >= 0.11 +BuildRequires: perl(Test::More) >= 0.47 +# Extra Tests BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) +# Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description @@ -34,6 +34,11 @@ them unused names and sets up their package data, if provided. %prep %setup -q -n Package-Generator-%{version} +# We need to patch the test suite if we have an old version of Test::More +%if %{old_test_more} +%patch1 +%endif + %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -45,7 +50,8 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \; %{_fixperms} %{buildroot} %check -make test %{!?perl_bootstrap:PERL_TEST_CRITIC=1} +make test +make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" %clean rm -rf %{buildroot} @@ -57,6 +63,14 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::Reaper.3pm* %changelog +* Mon Jul 8 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 1.105-1 +- Update to 1.105 + - Repackage, update bug tracker + - Drop pod tests +- Add patch to support building with Test::More < 0.88 +- Classify buildreqs by usage +- Explicitly run the extra tests + * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.103-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index cbe7bf0..51b875d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16cfb1693978960fcde88e57d627b2e0 Package-Generator-0.103.tar.gz +696d9ba65b5e7902faeaf9ab2e945947 Package-Generator-1.105.tar.gz -- 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