commit f845ed116373e13f223c03f371772311a15f793c Author: Paul Howarth <paul@xxxxxxxxxxxx> Date: Sat Jan 8 17:54:27 2011 +0000 Fixes for EPEL compatibility - Update patches for old Test::More and no Test::Requires - perl(Pod::Coverage::TrustPod) now available everywhere except EPEL-4 .gitignore | 1 - ...DeprecationManager-0.10-no-Test::Requires.patch | 6 +++--- ...ge-DeprecationManager-0.10-old-Test::More.patch | 14 +++++++------- perl-Package-DeprecationManager.spec | 16 ++++++++++------ 4 files changed, 20 insertions(+), 17 deletions(-) --- diff --git a/.gitignore b/.gitignore index 473a1e2..610185b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/Package-DeprecationManager-0.09.tar.gz /Package-DeprecationManager-0.10.tar.gz diff --git a/Package-DeprecationManager-0.08-no-Test::Requires.patch b/Package-DeprecationManager-0.10-no-Test::Requires.patch similarity index 57% rename from Package-DeprecationManager-0.08-no-Test::Requires.patch rename to Package-DeprecationManager-0.10-no-Test::Requires.patch index 840a410..94f2b4e 100644 --- a/Package-DeprecationManager-0.08-no-Test::Requires.patch +++ b/Package-DeprecationManager-0.10-no-Test::Requires.patch @@ -1,8 +1,8 @@ ---- Package-DeprecationManager-0.08/t/basic.t 2010-10-15 21:09:58.000000000 +0100 -+++ Package-DeprecationManager-0.08/t/basic.t 2010-10-15 21:10:50.632225765 +0100 +--- 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 @@ -4,9 +4,10 @@ use warnings; - use Test::Exception; use Test::More; + use Test::Fatal; -use Test::Requires { - 'Test::Output' => '0.16', diff --git a/Package-DeprecationManager-0.09-old-Test::More.patch b/Package-DeprecationManager-0.10-old-Test::More.patch similarity index 51% rename from Package-DeprecationManager-0.09-old-Test::More.patch rename to Package-DeprecationManager-0.10-old-Test::More.patch index 98d1a01..5356aaf 100644 --- a/Package-DeprecationManager-0.09-old-Test::More.patch +++ b/Package-DeprecationManager-0.10-old-Test::More.patch @@ -1,5 +1,5 @@ ---- Package-DeprecationManager-0.09/t/basic.t 2010-10-17 21:08:57.000000000 +0100 -+++ Package-DeprecationManager-0.09/t/basic.t 2010-10-18 11:06:20.627170768 +0100 +--- 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', }; @@ -7,16 +7,16 @@ +plan tests => 25; + { - throws_ok { - eval 'package Foo; use Package::DeprecationManager;'; -@@ -216,5 +218,3 @@ use Test::Requires { + 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.09/t/compile.t 2010-10-17 21:08:57.000000000 +0100 -+++ Package-DeprecationManager-0.09/t/compile.t 2010-10-18 11:07:01.795223136 +0100 +--- 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; diff --git a/perl-Package-DeprecationManager.spec b/perl-Package-DeprecationManager.spec index 950b2ae..da4f171 100644 --- a/perl-Package-DeprecationManager.spec +++ b/perl-Package-DeprecationManager.spec @@ -9,15 +9,15 @@ Name: perl-Package-DeprecationManager Version: 0.10 -Release: 1%{?dist} +Release: 2%{?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.09-old-Test::More.patch -Patch2: Package-DeprecationManager-0.08-no-Test::Requires.patch +Patch1: Package-DeprecationManager-0.10-old-Test::More.patch +Patch2: Package-DeprecationManager-0.10-no-Test::Requires.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Carp) @@ -31,8 +31,8 @@ BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Output) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) -# Pod::Coverage::TrustPod not yet in EPEL -%if 0%{?fedora} +# Pod::Coverage::TrustPod not yet in EPEL-4 +%if 0%{?rhel} > 4 BuildRequires: perl(Pod::Coverage::TrustPod) %endif %if %{extra_tests_available} @@ -90,7 +90,11 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::DeprecationManager.3pm* %changelog -* Sat Jan 08 2011 Iain Arnell <iarnell@xxxxxxxxx> 0.10-1 +* Sat Jan 08 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.10-2 +- Update patches for old Test::More and no Test::Requires +- perl(Pod::Coverage::TrustPod) now available everywhere except EPEL-4 + +* Sat Jan 08 2011 Iain Arnell <iarnell@xxxxxxxxx> - 0.10-1 - Update to 0.10: - Test suite uses Test::Fatal instead of Test::Exception -- 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