diff --git a/Sub-Exporter-Progressive-0.001010-old-Test::More.patch b/Sub-Exporter-Progressive-0.001012-old-Test::More.patch similarity index 62% rename from Sub-Exporter-Progressive-0.001010-old-Test::More.patch rename to Sub-Exporter-Progressive-0.001012-old-Test::More.patch index fcfa85a..766cd45 100644 --- a/Sub-Exporter-Progressive-0.001010-old-Test::More.patch +++ b/Sub-Exporter-Progressive-0.001012-old-Test::More.patch @@ -1,14 +1,23 @@ --- Makefile.PL +++ Makefile.PL -@@ -6,7 +6,7 @@ use ExtUtils::MakeMaker; - (do 'maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; +@@ -17,7 +17,7 @@ my %WriteMakefileArgs = ( + "NAME" => "Sub::Exporter::Progressive", + "PREREQ_PM" => {}, + "TEST_REQUIRES" => { +- "Test::More" => "0.88" ++ "Test::More" => "0.47" + }, + "VERSION" => "0.001012", + "test" => { +@@ -27,7 +27,7 @@ my %WriteMakefileArgs = ( - my %BUILD_DEPS = ( -- 'Test::More' => '0.88' -+ 'Test::More' => '0.47' + + my %FallbackPrereqs = ( +- "Test::More" => "0.88" ++ "Test::More" => "0.47" ); - my %RUN_DEPS = ( + --- t/all.t +++ t/all.t @@ -2,7 +2,7 @@ @@ -17,10 +26,10 @@ -use Test::More; +use Test::More tests => 6; - use List::Util 'first'; use lib 't/lib'; use A::JunkAll; -@@ -18,5 +18,3 @@ use A::JunkAll ':all'; + +@@ -17,5 +17,3 @@ use A::JunkAll ':all'; ok(main->can('junk1'), 'sub exported'); ok(main->can('junk2'), 'sub exported'); ok(! $INC{'Sub/Exporter.pm'}, 'Sub::Exporter not loaded'); @@ -28,13 +37,12 @@ -done_testing; --- t/basic.t +++ t/basic.t -@@ -2,12 +2,10 @@ +@@ -2,11 +2,9 @@ use strict; use warnings; -use Test::More; +use Test::More tests => 2; - use List::Util 'first'; use lib 't/lib'; use A::Junk 'junk1'; @@ -44,13 +52,12 @@ -done_testing; --- t/default.t +++ t/default.t -@@ -2,12 +2,10 @@ +@@ -2,11 +2,9 @@ use strict; use warnings; -use Test::More; +use Test::More tests => 2; - use List::Util 'first'; use lib 't/lib'; use A::Junk; @@ -58,6 +65,25 @@ ok(! $INC{'Sub/Exporter.pm'}, 'Sub::Exporter not loaded'); - -done_testing; +--- t/release-changes_has_content.t ++++ t/release-changes_has_content.t +@@ -10,7 +10,6 @@ BEGIN { + + use Test::More tests => 2; + +-note 'Checking Changes'; + my $changes_file = 'Changes'; + my $newver = '0.001012'; + my $trial_token = '-TRIAL'; +@@ -22,8 +21,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 --- t/sex.t +++ t/sex.t @@ -2,7 +2,7 @@ @@ -69,7 +95,7 @@ BEGIN { plan skip_all => 'Sub::Exporter not installed' unless eval { require Sub::Exporter }; -@@ -14,5 +14,3 @@ use A::Junk 'junk1' => { -as => 'junk' } +@@ -13,5 +13,3 @@ use A::Junk 'junk1' => { -as => 'junk' } ok(main->can('junk'), 'sub renamed with Sub::Exporter'); ok($INC{'Sub/Exporter.pm'}, 'Sub::Exporter loaded'); @@ -83,10 +109,10 @@ -use Test::More; +use Test::More tests => 44; - use List::Util 'first'; use Carp; use lib 't/lib'; -@@ -65,5 +65,3 @@ SKIP: { + use A::Junk ':other'; +@@ -64,5 +64,3 @@ SKIP: { check_tag('bar -default', [qw/foo bar/], [qw/baz/]); } diff --git a/perl-Sub-Exporter-Progressive.spec b/perl-Sub-Exporter-Progressive.spec index 12a13e6..990d7aa 100644 --- a/perl-Sub-Exporter-Progressive.spec +++ b/perl-Sub-Exporter-Progressive.spec @@ -2,29 +2,36 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Sub-Exporter-Progressive -Version: 0.001011 -Release: 7%{?dist} +Version: 0.001012 +Release: 1%{?dist} Summary: Only use Sub::Exporter if you need it Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Sub-Exporter-Progressive/ Source0: http://search.cpan.org/CPAN/authors/id/F/FR/FREW/Sub-Exporter-Progressive-%{version}.tar.gz -Patch1: Sub-Exporter-Progressive-0.001010-old-Test::More.patch +Patch1: Sub-Exporter-Progressive-0.001012-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # =============== Module Build ====================== +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) # =============== Module Runtime ==================== BuildRequires: perl(Carp) BuildRequires: perl(Exporter) >= 5.58 -BuildRequires: perl(List::Util) +BuildRequires: perl(strict) BuildRequires: perl(Sub::Exporter) +BuildRequires: perl(warnings) # =============== Test Suite ======================== +BuildRequires: perl(constant) BuildRequires: perl(lib) BuildRequires: perl(Test::More) # =============== Module Runtime ==================== Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +Requires: perl(Carp) Requires: perl(Exporter) >= 5.58 Requires: perl(Sub::Exporter) @@ -33,8 +40,8 @@ Sub::Exporter is an incredibly powerful module, but with that power comes great responsibility, er- as well as some runtime penalties. This module is a Sub::Exporter wrapper that will let your users just use Exporter if all they are doing is picking exports, but use Sub::Exporter if your users try to use -Sub::Exporter's more advanced features features, like renaming exports, if -they try to use them. +Sub::Exporter's more advanced features, like renaming exports, if they try to +use them. Note that this module will export @EXPORT and @EXPORT_OK package variables for Exporter to work. Additionally, if your package uses advanced Sub::Exporter @@ -56,7 +63,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name .packlist -delete %{_fixperms} %{buildroot} %check @@ -66,11 +73,24 @@ make test rm -rf %{buildroot} %files +%if 0%{?_licensedir:1} +%license LICENSE +%else +%doc LICENSE +%endif %doc Changes README %{perl_vendorlib}/Sub/ -%{_mandir}/man3/Sub::Exporter::Progressive.3pm* +%{_mandir}/man3/Sub::Exporter::Progressive.3* %changelog +* Wed Aug 24 2016 Paul Howarth - 0.001012-1 +- Update to 0.001012 + - Many small performance improvements +- BR: perl-generators +- Simplify find command using -delete +- Update old Test::More patch +- Package new LICENSE file + * Sun May 15 2016 Jitka Plesnikova - 0.001011-7 - Perl 5.24 rebuild diff --git a/sources b/sources index 91eb0f0..6b39159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb50b3ba1538902b197c04818a84230a Sub-Exporter-Progressive-0.001011.tar.gz +a6be2bcef9a9f5c5f2709060dae521a2 Sub-Exporter-Progressive-0.001012.tar.gz