diff --git a/Data-Section-0.101620-old-Test::More.patch b/Data-Section-0.101620-old-Test::More.patch deleted file mode 100644 index fee9537..0000000 --- a/Data-Section-0.101620-old-Test::More.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Data-Section-0.101620/t/basic.t 2010-06-11 13:14:39.000000000 +0100 -+++ Data-Section-0.101620/t/basic.t 2010-06-11 19:24:46.780635972 +0100 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - use lib 't/lib'; --use Test::More; -+use Test::More tests => 36; - - use Parent; - use Child; -@@ -168,5 +168,3 @@ - { n => \"foo$crlf" }, - "windows newlines work", - ); -- --done_testing; diff --git a/Data-Section-0.101622-note.patch b/Data-Section-0.101622-note.patch new file mode 100644 index 0000000..623b7c4 --- /dev/null +++ b/Data-Section-0.101622-note.patch @@ -0,0 +1,22 @@ +--- t/00-compile.t ++++ t/00-compile.t +@@ -34,7 +34,7 @@ sub _find_scripts { + my $found = $File::Find::name; + # nothing to skip + open my $FH, '<', $_ or do { +- note( "Unable to open $found in ( $! ), skipping" ); ++ diag( "Unable to open $found in ( $! ), skipping" ); + return; + }; + my $shebang = <$FH>; +--- 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.101622'; + my $trial_token = '-TRIAL'; diff --git a/Data-Section-0.101622-old-Test::More.patch b/Data-Section-0.101622-old-Test::More.patch new file mode 100644 index 0000000..ddc6ae2 --- /dev/null +++ b/Data-Section-0.101622-old-Test::More.patch @@ -0,0 +1,61 @@ +--- t/000-report-versions-tiny.t ++++ t/000-report-versions-tiny.t +@@ -1,12 +1,6 @@ + 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. +-our $success = 0; +-END { $success && done_testing; } ++use Test::More 0.47 tests => 1; + + # List our own version used to generate this + my $v = "\nGenerated by Dist::Zilla::Plugin::ReportVersions::Tiny v1.08\n"; +@@ -53,7 +47,7 @@ eval { $v .= pmver('File::Find','any ver + eval { $v .= pmver('File::Temp','any version') }; + eval { $v .= pmver('MRO::Compat','0.09') }; + eval { $v .= pmver('Sub::Exporter','0.979') }; +-eval { $v .= pmver('Test::More','0.96') }; ++eval { $v .= pmver('Test::More','0.47') }; + eval { $v .= pmver('Test::Pod','1.41') }; + eval { $v .= pmver('base','any version') }; + eval { $v .= pmver('lib','any version') }; +@@ -73,7 +67,6 @@ EOT + + diag($v); + ok(1, "we really didn't test anything, just reporting data"); +-$success = 1; + + # Work around another nasty module on CPAN. :/ + no warnings 'once'; +--- t/basic.t ++++ t/basic.t +@@ -1,7 +1,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More tests => 36; + + use Parent; + use Child; +@@ -168,5 +168,3 @@ is_deeply( + { n => \"foo$crlf" }, + "windows newlines work", + ); +- +-done_testing; +--- xt/release/changes_has_content.t ++++ xt/release/changes_has_content.t +@@ -14,8 +14,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-Data-Section.spec b/perl-Data-Section.spec index f1b1969..14808b5 100644 --- a/perl-Data-Section.spec +++ b/perl-Data-Section.spec @@ -1,24 +1,28 @@ # 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) +%global older_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.82) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Data-Section -Version: 0.101621 -Release: 5%{?dist} +Version: 0.101622 +Release: 1%{?dist} Summary: Read multiple hunks of data out of your DATA section License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-Section/ Source0: http://www.cpan.org/authors/id/R/RJ/RJBS/Data-Section-%{version}.tar.gz -Patch1: Data-Section-0.101620-old-Test::More.patch +Patch1: Data-Section-0.101622-old-Test::More.patch +Patch2: Data-Section-0.101622-note.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(base) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30 +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Temp) +BuildRequires: perl(lib) BuildRequires: perl(MRO::Compat) >= 0.09 -BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Sub::Exporter) >= 0.979 -BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 1.08 +BuildRequires: perl(Test::More) >= 0.47 +BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description @@ -31,7 +35,10 @@ modules to store their own templates, but probably has other uses. # Hack for old Test::More versions %if %{old_test_more} -%patch1 -p1 +%patch1 +%endif +%if %{older_test_more} +%patch2 %endif %build @@ -45,7 +52,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 @@ -56,6 +64,17 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/Data::Section.3pm* %changelog +* Thu Jun 20 2013 Paul Howarth - 0.101622-1 +- Update to 0.101622 + - Add a link to an Advent article about Data-Section + - Update bugtracker, repo, etc. +- Run the release tests separately +- BR: perl(base), perl(File::Find), perl(File::Temp) and perl(lib) for the test + suite +- Drop BR: perl(Pod::Coverage::TrustPod) and perl(Test::Pod::Coverage) as + upstream has dropped their Pod coverage test +- Update patch for building with old Test::More versions + * Thu Feb 14 2013 Fedora Release Engineering - 0.101621-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 30f4991..4efd5b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -573fd1a74356b13116118d86084a4693 Data-Section-0.101621.tar.gz +6b515f028076febb11d8332555e257f2 Data-Section-0.101622.tar.gz