diff --git a/Data-Section-Simple-0.02-old-Test::More.patch b/Data-Section-Simple-0.02-old-Test::More.patch deleted file mode 100644 index 81a775b..0000000 --- a/Data-Section-Simple-0.02-old-Test::More.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up Data-Section-Simple-0.02/t/basic.t.orig Data-Section-Simple-0.02/t/basic.t ---- Data-Section-Simple-0.02/t/basic.t.orig 2010-03-18 08:30:42.000000000 +0000 -+++ Data-Section-Simple-0.02/t/basic.t 2011-08-03 13:35:00.536119464 +0100 -@@ -1,6 +1,6 @@ - use strict; - use Data::Section::Simple qw(get_data_section); --use Test::More; -+use Test::More tests => 3; - - my $x = get_data_section(); - is_deeply [ sort keys %$x ], [ qw(bar.tt foo.html) ]; -@@ -19,8 +19,6 @@ bar - - TT - --done_testing; -- - __DATA__ - - @@ foo.html -diff -up Data-Section-Simple-0.02/t/data.t.orig Data-Section-Simple-0.02/t/data.t ---- Data-Section-Simple-0.02/t/data.t.orig 2010-03-18 21:59:01.000000000 +0000 -+++ Data-Section-Simple-0.02/t/data.t 2011-08-03 13:35:24.648055699 +0100 -@@ -1,6 +1,6 @@ - use lib "t"; - use DataInCode; --use Test::More; -+use Test::More tests => 1; - use Data::Section::Simple; - - my $d = Data::Section::Simple->new('DataInCode'); -@@ -8,7 +8,3 @@ my $x = $d->get_data_section; - - is $x->{foo}, "bar\n\n"; - --done_testing; -- -- -- -diff -up Data-Section-Simple-0.02/t/pkg_oo.t.orig Data-Section-Simple-0.02/t/pkg_oo.t ---- Data-Section-Simple-0.02/t/pkg_oo.t.orig 2010-03-18 08:26:28.000000000 +0000 -+++ Data-Section-Simple-0.02/t/pkg_oo.t 2011-08-03 13:35:51.142985668 +0100 -@@ -4,7 +4,7 @@ use Data::Section::Simple; - use lib "t"; - use Foo; - --use Test::More; -+use Test::More tests => 3; - - my $d = Data::Section::Simple->new('Foo'); - my $x = $d->get_data_section(); -@@ -24,5 +24,3 @@ bar - - TT - --done_testing; -- diff --git a/Data-Section-Simple-0.04-old-Test::More.patch b/Data-Section-Simple-0.04-old-Test::More.patch new file mode 100644 index 0000000..e1b4f48 --- /dev/null +++ b/Data-Section-Simple-0.04-old-Test::More.patch @@ -0,0 +1,69 @@ +diff -up Data-Section-Simple-0.04/t/basic.t.orig Data-Section-Simple-0.04/t/basic.t +--- Data-Section-Simple-0.04/t/basic.t.orig 2013-03-29 00:50:51.000000000 +0000 ++++ Data-Section-Simple-0.04/t/basic.t 2013-04-01 14:13:21.566927338 +0100 +@@ -1,6 +1,6 @@ + use strict; + use Data::Section::Simple qw(get_data_section); +-use Test::More; ++use Test::More tests => 3; + + my $x = get_data_section(); + is_deeply [ sort keys %$x ], [ qw(bar.tt foo.html) ]; +@@ -19,8 +19,6 @@ bar + + TT + +-done_testing; +- + __DATA__ + + @@ foo.html +diff -up Data-Section-Simple-0.04/t/data.t.orig Data-Section-Simple-0.04/t/data.t +--- Data-Section-Simple-0.04/t/data.t.orig 2013-03-29 00:50:51.000000000 +0000 ++++ Data-Section-Simple-0.04/t/data.t 2013-04-01 14:13:21.566927338 +0100 +@@ -1,6 +1,6 @@ + use lib "t"; + use DataInCode; +-use Test::More; ++use Test::More tests => 1; + use Data::Section::Simple; + + my $d = Data::Section::Simple->new('DataInCode'); +@@ -8,7 +8,3 @@ my $x = $d->get_data_section; + + is $x->{foo}, "bar\n\n"; + +-done_testing; +- +- +- +diff -up Data-Section-Simple-0.04/t/no-datat.t.orig Data-Section-Simple-0.04/t/no-datat.t +--- Data-Section-Simple-0.04/t/no-datat.t.orig 2013-03-29 00:50:51.000000000 +0000 ++++ Data-Section-Simple-0.04/t/no-datat.t 2013-04-01 14:14:04.310838315 +0100 +@@ -1,7 +1,5 @@ + use strict; + use Data::Section::Simple qw(get_data_section); +-use Test::More; ++use Test::More tests => 1; + + is get_data_section('foo.html'), undef, 'Do not die.'; +- +-done_testing; +diff -up Data-Section-Simple-0.04/t/pkg_oo.t.orig Data-Section-Simple-0.04/t/pkg_oo.t +--- Data-Section-Simple-0.04/t/pkg_oo.t.orig 2013-03-29 00:50:51.000000000 +0000 ++++ Data-Section-Simple-0.04/t/pkg_oo.t 2013-04-01 14:13:21.566927338 +0100 +@@ -4,7 +4,7 @@ use Data::Section::Simple; + use lib "t"; + use Foo; + +-use Test::More; ++use Test::More tests => 3; + + my $d = Data::Section::Simple->new('Foo'); + my $x = $d->get_data_section(); +@@ -24,5 +24,3 @@ bar + + TT + +-done_testing; +- diff --git a/perl-Data-Section-Simple.spec b/perl-Data-Section-Simple.spec index 4ca1987..357fe28 100644 --- a/perl-Data-Section-Simple.spec +++ b/perl-Data-Section-Simple.spec @@ -2,19 +2,28 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Data-Section-Simple -Version: 0.03 -Release: 5%{?dist} +Version: 0.04 +Release: 1%{?dist} Summary: Read data from __DATA__ License: GPL+ or Artistic Group: Development/Libraries -URL: http://search.cpan.org/dist/Data-Section-Simple/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Data-Section-Simple-%{version}.tar.gz -Patch1: Data-Section-Simple-0.02-old-Test::More.patch +URL: https://github.com/miyagawa/Data-Section-Simple +Source0: http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Data-Section-Simple-%{version}.tar.gz +Patch1: Data-Section-Simple-0.04-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch -BuildRequires: perl(ExtUtils::MakeMaker) +# Build +BuildRequires: perl(Module::Build::Tiny) +# Module +BuildRequires: perl(base) +BuildRequires: perl(Exporter) +# Test Suite +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Temp) +BuildRequires: perl(lib) BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Pod) >= 1.00 +BuildRequires: perl(Test::Pod) >= 1.41 +# Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) %description @@ -30,32 +39,38 @@ section of the file. %endif %build -# Note that the Makefile.PL complains about missing Test::Requires -# but the package doesn't actually use it (CPAN RT#69981) -perl Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +perl Build.PL --installdirs=vendor +./Build %install rm -rf %{buildroot} -make pure_install PERL_INSTALL_ROOT=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null +./Build install --destdir=%{buildroot} +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' %{_fixperms} %{buildroot} %check -make test -make test TEST_FILES="xt/*.t" +RELEASE_TESTING=1 ./Build test %clean rm -rf %{buildroot} %files -%defattr(-,root,root,-) -%doc Changes README +%doc Changes LICENSE README %{perl_vendorlib}/Data/ %{_mandir}/man3/Data::Section::Simple.3pm* %changelog +* Fri Mar 29 2013 Paul Howarth - 0.04-1 +- Update to 0.04 + - Do not throw exceptions when there's no template + (https://github.com/miyagawa/Data-Section-Simple/pull/2) +- URL moved to github +- Source0 moved to MetaCPAN +- Package upstream's new LICENSE file +- Switch to Module::Build::Tiny flow +- Update patch for building with Test::More < 0.88 +- Drop %%defattr, redundant since rpm 4.4 + * Thu Feb 14 2013 Fedora Release Engineering - 0.03-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 1b5a6a8..9084d3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8cd6ebdc75f56f035ca032a3d3383a4f Data-Section-Simple-0.03.tar.gz +34f06bef3ad373790dcbbdf14f7af1d0 Data-Section-Simple-0.04.tar.gz