diff --git a/Software-License-0.103001-old-Test::More.patch b/Software-License-0.103001-old-Test::More.patch deleted file mode 100644 index 33158f1..0000000 --- a/Software-License-0.103001-old-Test::More.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up Software-License-0.103001/t/custom.t.orig Software-License-0.103001/t/custom.t ---- Software-License-0.103001/t/custom.t.orig 2011-04-28 12:20:57.000000000 +0100 -+++ Software-License-0.103001/t/custom.t 2011-04-28 15:41:09.821742581 +0100 -@@ -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; -diff -up Software-License-0.103001/t/meta-names.t.orig Software-License-0.103001/t/meta-names.t ---- Software-License-0.103001/t/meta-names.t.orig 2011-04-28 12:20:57.000000000 +0100 -+++ Software-License-0.103001/t/meta-names.t 2011-04-28 15:40:17.974704365 +0100 -@@ -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; diff --git a/Software-License-0.103005-old-Test::More.patch b/Software-License-0.103005-old-Test::More.patch new file mode 100644 index 0000000..4d251ce --- /dev/null +++ b/Software-License-0.103005-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.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/perl-Software-License.spec b/perl-Software-License.spec index 75aff9e..d154096 100644 --- a/perl-Software-License.spec +++ b/perl-Software-License.spec @@ -2,8 +2,8 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Software-License -Version: 0.103004 -Release: 4%{?dist} +Version: 0.103005 +Release: 1%{?dist} Summary: Package that provides templated software licenses License: GPL+ or Artistic Group: Development/Libraries @@ -11,13 +11,14 @@ 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.103001-old-Test::More.patch +Patch1: Software-License-0.103005-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(Sub::Install) BuildRequires: perl(Text::Template) BuildRequires: perl(Test::More) @@ -32,7 +33,7 @@ Software-License contains templates for common open source software licenses. # Compatibility with old Test::More versions %if %{old_test_more} -%patch1 -p1 +%patch1 %endif %build @@ -46,7 +47,8 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; %{_fixperms} $RPM_BUILD_ROOT %check -make test RELEASE_TESTING=1 +make test +make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" %clean rm -rf $RPM_BUILD_ROOT @@ -59,6 +61,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Software::LicenseUtils.3pm* %changelog +* Sat Dec 8 2012 Paul Howarth - 0.103005-1 +- Update to 0.103005 + - Add MPL 2.0 +- BR: perl(File::Temp) +- Release tests moved to xt/ +- Update patch for building with old Test::More versions + * Fri Jul 20 2012 Fedora Release Engineering - 0.103004-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index de92768..78633b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c5fd53d93818566234578b27d667b35 Software-License-0.103004.tar.gz +e3d40a7306fb5b2ecc128f9def17b46c Software-License-0.103005.tar.gz