From ee7d0dd97e449f1d299d6feed3c961574fe3db56 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sat, 14 Nov 2015 17:58:13 +0000 Subject: [PATCH] Update to 0.15 - New upstream release 0.15 - Made this module co-operate with existing import() subs in packages that use this module, as long as you use this module last - Drop support for old distributions due to non-optional test dependency of Test::Warnings --- ...precationManager-0.14-old-List::Util.patch | 55 -------- ...precationManager-0.14-old-Test::More.patch | 133 ------------------ perl-Package-DeprecationManager.spec | 65 +++------ sources | 2 +- 4 files changed, 24 insertions(+), 231 deletions(-) delete mode 100644 Package-DeprecationManager-0.14-old-List::Util.patch delete mode 100644 Package-DeprecationManager-0.14-old-Test::More.patch diff --git a/Package-DeprecationManager-0.14-old-List::Util.patch b/Package-DeprecationManager-0.14-old-List::Util.patch deleted file mode 100644 index b053717..0000000 --- a/Package-DeprecationManager-0.14-old-List::Util.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- lib/Package/DeprecationManager.pm -+++ lib/Package/DeprecationManager.pm -@@ -6,7 +6,7 @@ use warnings; - our $VERSION = '0.14'; - - use Carp qw( croak ); --use List::Util 1.33 qw( any ); -+use List::MoreUtils qw( any ); - use Params::Util qw( _HASH0 ); - use Sub::Install; - ---- Makefile.PL -+++ Makefile.PL -@@ -19,7 +19,7 @@ my %WriteMakefileArgs = ( - "NAME" => "Package::DeprecationManager", - "PREREQ_PM" => { - "Carp" => 0, -- "List::Util" => "1.33", -+ "List::MoreUtils" => "0", - "Params::Util" => 0, - "Sub::Install" => 0, - "strict" => 0, ---- META.json -+++ META.json -@@ -39,7 +39,7 @@ - "runtime" : { - "requires" : { - "Carp" : "0", -- "List::Util" : "1.33", -+ "List::MoreUtils" : "0", - "Params::Util" : "0", - "Sub::Install" : "0", - "strict" : "0", ---- META.yml -+++ META.yml -@@ -26,7 +26,7 @@ provides: - version: '0.14' - requires: - Carp: '0' -- List::Util: '1.33' -+ List::MoreUtils: '0' - Params::Util: '0' - Sub::Install: '0' - strict: '0' ---- t/00-report-prereqs.dd -+++ t/00-report-prereqs.dd -@@ -24,7 +24,7 @@ do { my $x = { - 'runtime' => { - 'requires' => { - 'Carp' => '0', -- 'List::Util' => '1.33', -+ 'List::MoreUtils' => '0', - 'Params::Util' => '0', - 'Sub::Install' => '0', - 'strict' => '0', diff --git a/Package-DeprecationManager-0.14-old-Test::More.patch b/Package-DeprecationManager-0.14-old-Test::More.patch deleted file mode 100644 index 580fb10..0000000 --- a/Package-DeprecationManager-0.14-old-Test::More.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- t/author-eol.t -+++ t/author-eol.t -@@ -11,7 +11,7 @@ use warnings; - - # this test was generated with Dist::Zilla::Plugin::Test::EOL 0.17 - --use Test::More 0.88; -+use Test::More; - use Test::EOL; - - my @files = ( -@@ -33,5 +33,6 @@ my @files = ( - 't/release-tidyall.t' - ); - -+plan tests => scalar @files; -+ - eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files; --done_testing; ---- t/author-no-tabs.t -+++ t/author-no-tabs.t -@@ -11,7 +11,7 @@ use warnings; - - # this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.13 - --use Test::More 0.88; -+use Test::More; - use Test::NoTabs; - - my @files = ( -@@ -33,5 +33,6 @@ my @files = ( - 't/release-tidyall.t' - ); - -+plan tests => scalar @files; -+ - notabs_ok($_) foreach @files; --done_testing; ---- t/basic.t -+++ t/basic.t -@@ -2,12 +2,14 @@ use strict; - use warnings; - - use Test::Fatal; --use Test::More 0.88; -+use Test::More; - - use Test::Requires { - 'Test::Output' => '0.16', - }; - -+plan tests => 25; -+ - { - ## no critic (BuiltinFunctions::ProhibitStringyEval, ErrorHandling::RequireCheckingReturnValueOfEval) - like( -@@ -272,4 +274,3 @@ use Test::Requires { - ); - } - --done_testing(); ---- t/release-cpan-changes.t -+++ t/release-cpan-changes.t -@@ -1,19 +1,16 @@ - #!perl - -+use Test::More; -+ - BEGIN { -- unless ($ENV{RELEASE_TESTING}) { -- require Test::More; -- Test::More::plan(skip_all => 'these tests are for release candidate testing'); -- } -+ plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING}); -+ eval 'use Test::CPAN::Changes'; -+ plan skip_all => 'Test::CPAN::Changes required for this test' if $@; - } - - - use strict; - use warnings; - --use Test::More 0.96 tests => 2; --use_ok('Test::CPAN::Changes'); --subtest 'changes_ok' => sub { -- changes_file_ok('Changes'); --}; --done_testing(); -+plan tests => 4; -+changes_file_ok('Changes'); ---- t/release-pod-coverage.t -+++ t/release-pod-coverage.t -@@ -10,7 +10,7 @@ BEGIN { - # This file was automatically generated by Dist::Zilla::Plugin::Test::Pod::Coverage::Configurable. - - use Test::Pod::Coverage 1.08; --use Test::More 0.88; -+use Test::More; - - BEGIN { - if ( $] <= 5.008008 ) { -@@ -49,4 +49,3 @@ for my $module ( sort @modules ) { - ); - } - --done_testing(); ---- t/release-test-version.t -+++ t/release-test-version.t -@@ -26,5 +26,6 @@ push @imports, $params - - Test::Version->import(@imports); - --version_all_ok; --done_testing; -+plan tests => 3; -+ -+version_all_ok(); ---- t/release-tidyall.t -+++ t/release-tidyall.t -@@ -9,7 +9,7 @@ BEGIN { - - # This file was automatically generated by Dist::Zilla::Plugin::Test::TidyAll - --use Test::More 0.88; -+use Test::More; - - eval 'use Test::Code::TidyAll 0.24;'; - plan skip_all => 'Test::Code::TidyAll 0.24 required for testing tidiness' -@@ -17,4 +17,3 @@ plan skip_all => 'Test::Code::TidyAll 0. - - tidyall_ok(); - --done_testing(); diff --git a/perl-Package-DeprecationManager.spec b/perl-Package-DeprecationManager.spec index 3062ac4..1633803 100644 --- a/perl-Package-DeprecationManager.spec +++ b/perl-Package-DeprecationManager.spec @@ -1,69 +1,57 @@ -# 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.96) ? 1 : 0);' 2>/dev/null || echo 0) - -# CPAN::Meta isn't available in EPEL < 7 due to requirement of perl(version) ≥ 0.88 -%global cpan_meta_available %(expr 0%{?fedora} + 0%{?rhel} '>' 6) - -# TODO: BR: perl(Test::Code::TidyAll) >= 0.24 when available +# TODO: BR: perl(Test::Code::TidyAll) ≥ 0.24 when available # NOTE: BR: perl(Test::Pod::No404s) not included as it requires network access Name: perl-Package-DeprecationManager -Version: 0.14 -Release: 4%{?dist} +Version: 0.15 +Release: 1%{?dist} Summary: Manage deprecation warnings for your distribution -Group: Development/Libraries License: Artistic 2.0 URL: http://search.cpan.org/dist/Package-DeprecationManager/ Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Package-DeprecationManager-%{version}.tar.gz Patch0: Package-DeprecationManager-0.14-no-Test::Code::TidyAll.patch -Patch1: Package-DeprecationManager-0.14-old-List::Util.patch -Patch2: Package-DeprecationManager-0.14-old-Test::More.patch Patch3: Package-DeprecationManager-0.14-stopwords.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # Module Build +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) # Module Runtime BuildRequires: perl(Carp) -%if 0%{?fedora} < 21 || 0%{?rhel} < 8 -BuildRequires: perl(List::MoreUtils) -%else -BuildRequires: perl(List::Util) -%endif +BuildRequires: perl(List::Util) >= 1.33 +BuildRequires: perl(Package::Stash) BuildRequires: perl(Params::Util) BuildRequires: perl(strict) BuildRequires: perl(Sub::Install) BuildRequires: perl(warnings) # Test Suite +BuildRequires: perl(Exporter) BuildRequires: perl(File::Spec) -BuildRequires: perl(IO::Handle) -BuildRequires: perl(IPC::Open3) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Requires) +BuildRequires: perl(Test::Warnings) # Optional Tests -%if %{cpan_meta_available} BuildRequires: perl(CPAN::Meta) >= 2.120900 BuildRequires: perl(CPAN::Meta::Prereqs) -%endif -%if 0%{?fedora} || 0%{?rhel} > 6 -BuildRequires: perl(Test::Output) >= 0.16 -%endif %if 0%{!?perl_bootstrap:1} && ! 0%{?rhel} # Author Tests +BuildRequires: perl(blib) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(IPC::Open3) BuildRequires: perl(Pod::Wordlist) BuildRequires: perl(Test::EOL) +BuildRequires: perl(Test::Mojibake) BuildRequires: perl(Test::NoTabs) +BuildRequires: perl(Test::Pod) >= 1.41 BuildRequires: perl(Test::Spelling), hunspell-en +BuildRequires: perl(Test::Version) >= 1.002 # Release Tests BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Test::CPAN::Changes) >= 0.19 -BuildRequires: perl(Test::Pod) >= 1.41 BuildRequires: perl(Test::Pod::Coverage) >= 1.08 BuildRequires: perl(Test::Pod::LinkCheck) BuildRequires: perl(Test::Portability::Files) -BuildRequires: perl(Test::Version) >= 1.002 %endif # Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) @@ -81,16 +69,6 @@ the version when that feature was deprecated. # Test::Code::TidyAll not yet available in Fedora %patch0 -# We need to patch the module if we have an old version of List::Util -%if 0%{?fedora} < 21 || 0%{?rhel} < 8 -%patch1 -%endif - -# Fix tests for Test::More prior to 0.96 -%if %{old_test_more} -%patch2 -%endif - # "PayPal" not a common dictionary word %patch3 @@ -99,7 +77,6 @@ perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install -rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; %{_fixperms} %{buildroot} @@ -111,9 +88,6 @@ make test AUTHOR_TESTING=1 RELEASE_TESTING=1 make test %endif -%clean -rm -rf %{buildroot} - %files %if 0%{?_licensedir:1} %license LICENSE @@ -125,6 +99,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::DeprecationManager.3* %changelog +* Sat Nov 14 2015 Paul Howarth - 0.15-1 +- Update to 0.15 + - Made this module co-operate with existing import() subs in packages that + use this module, as long as you use this module last +- Drop support for old distributions due to non-optional test dependency of + Test::Warnings + * Thu Jun 18 2015 Fedora Release Engineering - 0.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index a9a9ec3..50525a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e15e14a4e3f914eff937a55549692f51 Package-DeprecationManager-0.14.tar.gz +121b7ab5aa5fe06f79670f4bb78c808e Package-DeprecationManager-0.15.tar.gz