commit da2d63dc235b557b1139091c6b09966eb8bb1561 Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Mon Mar 5 10:50:34 2012 +0000 Update to 0.12 - New upstream release 0.12: - Fix tests to pass with Carp 1.25 (CPAN RT#75520) - BR: perl(Test::Spelling), aspell-en - Add patch to accept "deprecations" as a valid dictionary word - Update patches to apply cleanly - Don't need to remove empty directories from buildroot - Don't use macros for commands - Drop EPEL-4 support: - Drop patch supporting build with ExtUtils::MakeMaker < 6.30 Package-DeprecationManager-0.11-old-EU::MM.patch | 30 ---------- ...ge-DeprecationManager-0.11-old-Test::More.patch | 56 ------------------ ...DeprecationManager-0.12-no-Test::Requires.patch | 6 +- ...ge-DeprecationManager-0.12-old-Test::More.patch | 60 ++++++++++++++++++++ Package-DeprecationManager-0.12-stopwords.patch | 7 ++ perl-Package-DeprecationManager.spec | 48 +++++++++------- sources | 2 +- 7 files changed, 98 insertions(+), 111 deletions(-) --- diff --git a/Package-DeprecationManager-0.10-no-Test::Requires.patch b/Package-DeprecationManager-0.12-no-Test::Requires.patch similarity index 62% rename from Package-DeprecationManager-0.10-no-Test::Requires.patch rename to Package-DeprecationManager-0.12-no-Test::Requires.patch index 94f2b4e..6eb79c5 100644 --- a/Package-DeprecationManager-0.10-no-Test::Requires.patch +++ b/Package-DeprecationManager-0.12-no-Test::Requires.patch @@ -1,8 +1,8 @@ ---- Package-DeprecationManager-0.10/t/basic.t 2010-10-27 09:27:42.000000000 +0100 -+++ Package-DeprecationManager-0.10/t/basic.t 2010-10-27 09:28:07.699161151 +0100 +--- t/basic.t ++++ t/basic.t @@ -4,9 +4,10 @@ use warnings; - use Test::More; use Test::Fatal; + use Test::More; -use Test::Requires { - 'Test::Output' => '0.16', diff --git a/Package-DeprecationManager-0.12-old-Test::More.patch b/Package-DeprecationManager-0.12-old-Test::More.patch new file mode 100644 index 0000000..a9ed10d --- /dev/null +++ b/Package-DeprecationManager-0.12-old-Test::More.patch @@ -0,0 +1,60 @@ +--- 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; ++ + { + like( + exception { +@@ -218,5 +220,3 @@ use Test::Requires { + q{}, + 'no deprecation warning for second call to My::Package1::foo()'; + } +- +-done_testing(); +--- t/compile.t ++++ t/compile.t +@@ -1,9 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 1; + + eval "require Package::DeprecationManager"; + ok( ! $@, 'no errors loading require Package::DeprecationManager' ); +- +-done_testing(); +--- t/release-cpan-changes.t ++++ t/release-cpan-changes.t +@@ -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/Package-DeprecationManager-0.12-stopwords.patch b/Package-DeprecationManager-0.12-stopwords.patch new file mode 100644 index 0000000..91c053a --- /dev/null +++ b/Package-DeprecationManager-0.12-stopwords.patch @@ -0,0 +1,7 @@ +--- t/release-pod-spell.t ++++ t/release-pod-spell.t +@@ -31,3 +31,4 @@ + PayPal + Rolsky + api ++deprecations diff --git a/perl-Package-DeprecationManager.spec b/perl-Package-DeprecationManager.spec index cb7fe95..85b3b97 100644 --- a/perl-Package-DeprecationManager.spec +++ b/perl-Package-DeprecationManager.spec @@ -1,8 +1,5 @@ -# We don't really need ExtUtils::MakeMaker ≥ 6.30 -%global old_eumm %(%{__perl} -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.30 ? 1 : 0;' 2>/dev/null || echo 0) - # We need to patch the test suite if we have an old version of Test::More -%global old_test_more %(%{__perl} -MTest::More -e 'printf "%d\\n", $Test::More::VERSION < 0.88 ? 1 : 0;' 2>/dev/null || echo 0) +%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) # Test::Kwalitee and Test::Requires not available in EPEL < 6 %global extra_tests_available %(expr 0%{?fedora} + 0%{?rhel} '>' 5) @@ -11,23 +8,27 @@ %global cpan_changes_available %(expr 0%{?fedora} + 0%{?rhel} '>' 6) Name: perl-Package-DeprecationManager -Version: 0.11 -Release: 3%{?dist} +Version: 0.12 +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.11-old-EU::MM.patch -Patch1: Package-DeprecationManager-0.11-old-Test::More.patch -Patch2: Package-DeprecationManager-0.10-no-Test::Requires.patch +Patch1: Package-DeprecationManager-0.12-old-Test::More.patch +Patch2: Package-DeprecationManager-0.12-no-Test::Requires.patch +Patch3: Package-DeprecationManager-0.12-stopwords.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch BuildRequires: perl(Carp) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(List::MoreUtils) BuildRequires: perl(Params::Util) +BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Sub::Install) +%if %{cpan_changes_available} +BuildRequires: perl(Test::CPAN::Changes) +%endif BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) @@ -35,10 +36,7 @@ BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -BuildRequires: perl(Pod::Coverage::TrustPod) -%if %{cpan_changes_available} -BuildRequires: perl(Test::CPAN::Changes) -%endif +BuildRequires: perl(Test::Spelling), aspell-en %if %{extra_tests_available} BuildRequires: perl(Test::Kwalitee) BuildRequires: perl(Test::Requires) @@ -55,21 +53,19 @@ the version when that feature was deprecated. %prep %setup -q -n Package-DeprecationManager-%{version} -# We don't really need ExtUtils::MakeMaker ≥ 6.30 -%if %{old_eumm} -%patch0 -p1 -%endif - # Fix tests for Test::More prior to 0.88 %if %{old_test_more} -%patch1 -p1 +%patch1 %endif # If we don't have Test::Requires, we need to patch it out of the test suite %if ! %{extra_tests_available} -%patch2 -p1 +%patch2 %endif +# "deprecations" not a common dictionary word +%patch3 + %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -78,7 +74,6 @@ make %{?_smp_mflags} rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; -find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null %{_fixperms} %{buildroot} %check @@ -94,6 +89,17 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::DeprecationManager.3pm* %changelog +* Mon Mar 5 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 0.12-1 +- Update to 0.12: + - Fix tests to pass with Carp 1.25 (CPAN RT#75520) +- BR: perl(Test::Spelling), aspell-en +- Add patch to accept "deprecations" as a valid dictionary word +- Update patches to apply cleanly +- Don't need to remove empty directories from buildroot +- Don't use macros for commands +- Drop EPEL-4 support: + - Drop patch supporting build with ExtUtils::MakeMaker < 6.30 + * Thu Jan 12 2012 Paul Howarth <paul@xxxxxxxxxxxx> - 0.11-3 - Fedora 17 mass rebuild diff --git a/sources b/sources index 5ce02d7..18b6b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d09664839b730997c591a5c891a2972b Package-DeprecationManager-0.11.tar.gz +5f7f21db151fa7f19c10cb6009a735d4 Package-DeprecationManager-0.12.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel