diff --git a/Software-License-0.103005-old-Test::More.patch b/Software-License-0.103005-old-Test::More.patch deleted file mode 100644 index 4d251ce..0000000 --- a/Software-License-0.103005-old-Test::More.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- t/000-report-versions-tiny.t -+++ t/000-report-versions-tiny.t -@@ -1,12 +1,8 @@ - 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; } -+END { $success; } - - # List our own version used to generate this - my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.08\n"; ---- t/custom.t -+++ t/custom.t -@@ -2,7 +2,7 @@ - use strict; - use warnings; - --use Test::More; -+use Test::More tests => 8; - - use Software::License::Custom; - -@@ -40,5 +40,3 @@ Well... this is only some sample text. I - - Yes, spanning more lines and more paragraphs. - END_OF_FULLTEXT -- --done_testing; ---- t/meta-names.t -+++ t/meta-names.t -@@ -2,13 +2,16 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More; - - my @files = ; - -+plan tests => scalar @files; -+ - for my $module (@files) { - # It's retired. Dunno if it's okay to be open_source. Punt! -- next if $module =~ /Sun.pm$/; -+ SKIP: { -+ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~ /Sun.pm$/; - - my $pkg = $module; - $pkg =~ s{^lib/}{}; -@@ -18,6 +21,5 @@ for my $module (@files) { - eval "require $pkg; 1"; - - ok(defined $pkg->meta_name, "$pkg provide meta_name"); -+ } - } -- --done_testing; ---- xt/release/changes_has_content.t -+++ xt/release/changes_has_content.t -@@ -2,7 +2,7 @@ - - use Test::More tests => 2; - --note 'Checking Changes'; -+diag 'Checking Changes'; - my $changes_file = 'Changes'; - my $newver = '0.103005'; - my $trial_token = '-TRIAL'; -@@ -14,8 +14,6 @@ - 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/Software-License-0.103006-old-Test::More.patch b/Software-License-0.103006-old-Test::More.patch new file mode 100644 index 0000000..f8e9ede --- /dev/null +++ b/Software-License-0.103006-old-Test::More.patch @@ -0,0 +1,83 @@ +--- t/000-report-versions-tiny.t ++++ t/000-report-versions-tiny.t +@@ -1,12 +1,8 @@ + 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; } ++END { $success; } + + # List our own version used to generate this + my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.10\n"; +--- t/custom.t ++++ t/custom.t +@@ -2,7 +2,7 @@ + use strict; + use warnings; + +-use Test::More; ++use Test::More tests => 8; + + use Software::License::Custom; + +@@ -40,5 +40,3 @@ Well... this is only some sample text. I + + Yes, spanning more lines and more paragraphs. + END_OF_FULLTEXT +- +-done_testing; +--- t/meta-names.t ++++ t/meta-names.t +@@ -2,13 +2,16 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More; + + my @files = ; + ++plan tests => scalar @files; ++ + for my $module (@files) { + # It's retired. Dunno if it's okay to be open_source. Punt! +- next if $module =~ /Sun.pm$/; ++ SKIP: { ++ skip "Dunno if it's okay for Sun.pm to be open_source", 1 if $module =~ /Sun.pm$/; + + my $pkg = $module; + $pkg =~ s{^lib/}{}; +@@ -18,6 +21,5 @@ for my $module (@files) { + eval "require $pkg; 1"; + + ok(defined $pkg->meta_name, "$pkg provide meta_name"); ++ } + } +- +-done_testing; +--- xt/release/changes_has_content.t ++++ xt/release/changes_has_content.t +@@ -2,7 +2,7 @@ + + use Test::More tests => 2; + +-note 'Checking Changes'; ++diag 'Checking Changes'; + my $changes_file = 'Changes'; + my $newver = '0.103006'; + my $trial_token = '-TRIAL'; +@@ -14,8 +14,6 @@ + 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-Software-License.spec b/perl-Software-License.spec index 29f6cb3..401bb5b 100644 --- a/perl-Software-License.spec +++ b/perl-Software-License.spec @@ -3,7 +3,7 @@ Name: perl-Software-License Version: 0.103006 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Package that provides templated software licenses License: GPL+ or Artistic Group: Development/Libraries @@ -11,14 +11,15 @@ URL: http://search.cpan.org/dist/Software-License/ # For unknown reasons this module URL is currently missing #Source0: http://www.cpan.org/modules/by-module/Software/Software-License-%{version}.tar.gz Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Software-License-%{version}.tar.gz -Patch1: Software-License-0.103005-old-Test::More.patch +Patch1: Software-License-0.103006-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch BuildRequires: perl(base) BuildRequires: perl(Carp) BuildRequires: perl(Data::Section) BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(File::Temp) +BuildRequires: perl(File::Spec) +BuildRequires: perl(IO::Dir) BuildRequires: perl(Module::Load) BuildRequires: perl(Sub::Install) BuildRequires: perl(Text::Template) @@ -62,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Software::LicenseUtils.3pm* %changelog +* Mon Oct 21 2013 Paul Howarth - 0.103006-2 +- Update patch for building with old Test::More versions +- Update core buildreqs for completeness + * Mon Oct 21 2013 Daniel P. Berrange - 0.103006-1 * Update to 0.103006 release (rhbz #1021385)