From 4e4ca7b1173c54e15c42641713f63747ffe0966e Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Mon, 20 Jun 2011 12:59:28 +0100 Subject: [PATCH] Update to 0.11 - New upstream release 0.11: - Allow an empty hash for the -deprecations parameter - BR: perl(Test::CPAN::Changes) - BR: perl(Pod::Coverage::TrustPod) unconditionally - Update patches for old ExtUtils::MakeMaker and Test::More compatibility --- .gitignore | 2 +- ...precationManager-0.10-old-Test::More.patch | 30 ---------- ...e-DeprecationManager-0.11-old-EU::MM.patch | 8 +-- ...precationManager-0.11-old-Test::More.patch | 56 +++++++++++++++++++ perl-Package-DeprecationManager.spec | 22 ++++++-- sources | 2 +- 6 files changed, 78 insertions(+), 42 deletions(-) delete mode 100644 Package-DeprecationManager-0.10-old-Test::More.patch rename Package-DeprecationManager-0.08-old-EU::MM.patch => Package-DeprecationManager-0.11-old-EU::MM.patch (71%) create mode 100644 Package-DeprecationManager-0.11-old-Test::More.patch diff --git a/.gitignore b/.gitignore index 610185b..5e96111 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/Package-DeprecationManager-0.10.tar.gz +/Package-DeprecationManager-[0-9.]*.tar.gz diff --git a/Package-DeprecationManager-0.10-old-Test::More.patch b/Package-DeprecationManager-0.10-old-Test::More.patch deleted file mode 100644 index 5356aaf..0000000 --- a/Package-DeprecationManager-0.10-old-Test::More.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Package-DeprecationManager-0.10/t/basic.t 2010-10-26 18:35:07.000000000 +0100 -+++ Package-DeprecationManager-0.10/t/basic.t 2010-10-27 09:25:24.244144715 +0100 -@@ -8,6 +8,8 @@ use Test::Requires { - 'Test::Output' => '0.16', - }; - -+plan tests => 25; -+ - { - like( - exception { -@@ -218,5 +220,3 @@ use Test::Requires { - q{}, - 'no deprecation warning for second call to My::Package1::foo()'; - } -- --done_testing(); ---- Package-DeprecationManager-0.10/t/compile.t 2010-10-26 18:35:07.000000000 +0100 -+++ Package-DeprecationManager-0.10/t/compile.t 2010-10-27 09:24:47.312183595 +0100 -@@ -1,9 +1,7 @@ - use strict; - use warnings; - --use Test::More; -+use Test::More tests => 1; - - eval "require Package::DeprecationManager"; - ok( ! $@, 'no errors loading require Package::DeprecationManager' ); -- --done_testing(); diff --git a/Package-DeprecationManager-0.08-old-EU::MM.patch b/Package-DeprecationManager-0.11-old-EU::MM.patch similarity index 71% rename from Package-DeprecationManager-0.08-old-EU::MM.patch rename to Package-DeprecationManager-0.11-old-EU::MM.patch index 711a083..0dc7664 100644 --- a/Package-DeprecationManager-0.08-old-EU::MM.patch +++ b/Package-DeprecationManager-0.11-old-EU::MM.patch @@ -1,10 +1,10 @@ ---- Package-DeprecationManager-0.08/Makefile.PL 2010-10-15 17:39:30.000000000 +0100 -+++ Package-DeprecationManager-0.08/Makefile.PL 2010-10-15 21:04:14.211191379 +0100 +--- Package-DeprecationManager/Makefile.PL ++++ Package-DeprecationManager/Makefile.PL @@ -4,7 +4,7 @@ use warnings; --use ExtUtils::MakeMaker 6.31; +-use ExtUtils::MakeMaker 6.30; +use ExtUtils::MakeMaker; @@ -13,7 +13,7 @@ 'Test::Requires' => '0' }, 'CONFIGURE_REQUIRES' => { -- 'ExtUtils::MakeMaker' => '6.31' +- 'ExtUtils::MakeMaker' => '6.30' + 'ExtUtils::MakeMaker' => '0' }, 'DISTNAME' => 'Package-DeprecationManager', diff --git a/Package-DeprecationManager-0.11-old-Test::More.patch b/Package-DeprecationManager-0.11-old-Test::More.patch new file mode 100644 index 0000000..c6a397c --- /dev/null +++ b/Package-DeprecationManager-0.11-old-Test::More.patch @@ -0,0 +1,56 @@ +diff -up Package-DeprecationManager-0.11/t/basic.t.orig Package-DeprecationManager-0.11/t/basic.t +--- Package-DeprecationManager-0.11/t/basic.t.orig 2011-06-20 03:32:49.000000000 +0100 ++++ Package-DeprecationManager-0.11/t/basic.t 2011-06-20 10:57:16.388489180 +0100 +@@ -8,6 +8,8 @@ use Test::Requires { + 'Test::Output' => '0.16', + }; + ++plan tests => 25; ++ + { + like( + exception { +@@ -218,5 +220,3 @@ use Test::Requires { + q{}, + 'no deprecation warning for second call to My::Package1::foo()'; + } +- +-done_testing(); +diff -up Package-DeprecationManager-0.11/t/compile.t.orig Package-DeprecationManager-0.11/t/compile.t +--- Package-DeprecationManager-0.11/t/compile.t.orig 2011-06-20 03:32:49.000000000 +0100 ++++ Package-DeprecationManager-0.11/t/compile.t 2011-06-20 10:57:16.398490068 +0100 +@@ -1,9 +1,7 @@ + use strict; + use warnings; + +-use Test::More; ++use Test::More tests => 1; + + eval "require Package::DeprecationManager"; + ok( ! $@, 'no errors loading require Package::DeprecationManager' ); +- +-done_testing(); +diff -up Package-DeprecationManager-0.11/t/release-cpan-changes.t.orig Package-DeprecationManager-0.11/t/release-cpan-changes.t +--- Package-DeprecationManager-0.11/t/release-cpan-changes.t.orig 2011-06-20 03:32:49.000000000 +0100 ++++ Package-DeprecationManager-0.11/t/release-cpan-changes.t 2011-06-20 11:00:39.775567270 +0100 +@@ -1,15 +1,11 @@ + #!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 Test::More; +-eval 'use Test::CPAN::Changes'; +-plan skip_all => 'Test::CPAN::Changes required for this test' if $@; + changes_ok(); +-done_testing(); diff --git a/perl-Package-DeprecationManager.spec b/perl-Package-DeprecationManager.spec index c3461e2..c02262e 100644 --- a/perl-Package-DeprecationManager.spec +++ b/perl-Package-DeprecationManager.spec @@ -7,16 +7,19 @@ # Test::Kwalitee and Test::Requires not available in EPEL < 6 %global extra_tests_available %(expr 0%{?fedora} + 0%{?rhel} '>' 5) +# Test::CPAN::Changes isn't available in EPEL-6 either, due to requirement of perl(version) ≥ 0.79 +%global cpan_changes_available %(expr 0%{?fedora} + 0%{?rhel} '>' 6) + Name: perl-Package-DeprecationManager -Version: 0.10 -Release: 3%{?dist} +Version: 0.11 +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.08-old-EU::MM.patch -Patch1: Package-DeprecationManager-0.10-old-Test::More.patch +Patch0: Package-DeprecationManager-0.11-old-EU::MM.patch +Patch1: Package-DeprecationManager-0.11-old-Test::More.patch Patch2: Package-DeprecationManager-0.10-no-Test::Requires.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -31,9 +34,9 @@ BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -# Pod::Coverage::TrustPod not yet in EPEL-4 -%if 0%{?rhel} > 4 BuildRequires: perl(Pod::Coverage::TrustPod) +%if %{cpan_changes_available} +BuildRequires: perl(Test::CPAN::Changes) %endif %if %{extra_tests_available} BuildRequires: perl(Test::Kwalitee) @@ -90,6 +93,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::DeprecationManager.3pm* %changelog +* Mon Jun 20 2011 Paul Howarth - 0.11-1 +- Update to 0.11: + - Allow an empty hash for the -deprecations parameter +- BR: perl(Test::CPAN::Changes) +- BR: perl(Pod::Coverage::TrustPod) unconditionally +- Update patches for old ExtUtils::MakeMaker and Test::More compatibility + * Tue Feb 08 2011 Fedora Release Engineering - 0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index a259fc1..5ce02d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2efce2d3098e2ddc1dc87f89d1aa8b2 Package-DeprecationManager-0.10.tar.gz +d09664839b730997c591a5c891a2972b Package-DeprecationManager-0.11.tar.gz