commit cd10c7bd0c04ca6fdfd11f30f69359f26eddab41
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Tue Sep 6 23:07:17 2011 +0100
Update to 0.08:
- New upstream release 0.08:
- The previous version was missing a prereq declaration for Data::OptList
(CPAN RT#70285)
- This release by DROLSKY -> update source URL
- Package new documentation: LICENSE and README
- Add build requirements for new release tests and run them:
- perl(Pod::Coverage::Moose)
- perl(Test::CPAN::Changes)
- perl(Test::EOL)
- perl(Test::NoTabs)
- perl(Test::Pod)
- perl(Test::Pod::Coverage)
- perl(Test::Requires)
- perl(Test::Spelling) and aspell-en
- Add patch for building with ExtUtils::MakeMaker < 6.30
- Add patch for building with Test::More < 0.88
- Add patch for building without Test::Requires
- Add patch for fixing spell checker word list
- Don't try to run the POD Coverage test if we don't have Pod::Coverage::Moose
.gitignore | 2 +-
Class-Load-0.08-no-Test::Requires.patch | 25 ++++
Class-Load-0.08-old-Test::More.patch | 203 +++++++++++++++++++++++++++++++
Class-Load-0.08-old-eu::mm.patch | 30 +++++
Class-Load-0.08-stopwords.patch | 13 ++
perl-Class-Load.spec | 90 +++++++++++++-
sources | 2 +-
7 files changed, 356 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3c706b..41689b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Class-Load-0.06.tar.gz
+/Class-Load-[0-9.]*.tar.gz
diff --git a/Class-Load-0.08-no-Test::Requires.patch b/Class-Load-0.08-no-Test::Requires.patch
new file mode 100644
index 0000000..1ec26a7
--- /dev/null
+++ b/Class-Load-0.08-no-Test::Requires.patch
@@ -0,0 +1,25 @@
+--- Class-Load-0.08/t/release-pod-coverage.t.orig 2011-08-16 11:31:42.095025148 +0100
++++ Class-Load-0.08/t/release-pod-coverage.t 2011-08-16 12:34:11.961313546 +0100
+@@ -5,6 +5,11 @@
+ require Test::More;
+ Test::More::plan(skip_all => 'these tests are for release candidate testing');
+ }
++ eval "use Test::Pod::Coverage 1.04;";
++ if ($@) {
++ require Test::More;
++ Test::More::plan(skip_all => 'Test::Pod::Coverage 1.04 is required for this test');
++ }
+ }
+
+
+@@ -13,10 +18,6 @@
+
+ use Test::More tests => 1;
+
+-use Test::Requires {
+- 'Test::Pod::Coverage' => '1.04',
+-};
+-
+ my @modules = 'Class::Load';
+
+ my %trustme;
diff --git a/Class-Load-0.08-old-Test::More.patch b/Class-Load-0.08-old-Test::More.patch
new file mode 100644
index 0000000..21b0213
--- /dev/null
+++ b/Class-Load-0.08-old-Test::More.patch
@@ -0,0 +1,203 @@
+diff -up Class-Load-0.08/t/000-load.t.orig Class-Load-0.08/t/000-load.t
+--- Class-Load-0.08/t/000-load.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/000-load.t 2011-08-16 11:12:10.421565571 +0100
+@@ -1,12 +1,10 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More 0.88;
++use Test::More tests => 1;
+
+ use lib 't/lib';
+
+ use_ok 'Test::Class::Load';
+
+ diag('Using ' . Class::Load->_implementation() . ' implementation' );
+-
+-done_testing;
+diff -up Class-Load-0.08/t/001-is-class-loaded.t.orig Class-Load-0.08/t/001-is-class-loaded.t
+--- Class-Load-0.08/t/001-is-class-loaded.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/001-is-class-loaded.t 2011-08-16 11:12:10.421565571 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More 0.88;
++use Test::More tests => 18;
+
+ use version;
+
+@@ -110,5 +110,3 @@ ok(!is_class_loaded('Class::Load::Versio
+ 'Class::Load::VersionCheck has been loaded but the version check failed');
+ ok(is_class_loaded('Class::Load::VersionCheck', {-version => 41}),
+ 'Class::Load::VersionCheck has been loaded and the version check passed');
+-
+-done_testing;
+diff -up Class-Load-0.08/t/002-try-load-class.t.orig Class-Load-0.08/t/002-try-load-class.t
+--- Class-Load-0.08/t/002-try-load-class.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/002-try-load-class.t 2011-08-16 11:12:10.421565571 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More 0.88;
++use Test::More tests => 18;
+ use lib 't/lib';
+ use Test::Class::Load ':all';
+
+@@ -35,5 +35,3 @@ ok(try_load_class('Class::Load::VersionC
+
+ ok(try_load_class('Class::Load::VersionCheck2', { -version => 41 }));
+ ok(!try_load_class('Class::Load::VersionCheck2', { -version => 43 }));
+-
+-done_testing;
+diff -up Class-Load-0.08/t/003-load-class.t.orig Class-Load-0.08/t/003-load-class.t
+--- Class-Load-0.08/t/003-load-class.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/003-load-class.t 2011-08-16 11:12:10.422565569 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More 0.88;
++use Test::More tests => 19;
+ use lib 't/lib';
+ use Test::Class::Load ':all';
+ use Test::Fatal;
+@@ -52,5 +52,3 @@ like( exception {
+ like( exception {
+ load_class('__PACKAGE__')
+ }, qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm' );
+-
+-done_testing;
+diff -up Class-Load-0.08/t/004-load-double.t.orig Class-Load-0.08/t/004-load-double.t
+--- Class-Load-0.08/t/004-load-double.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/004-load-double.t 2011-08-16 11:12:10.422565569 +0100
+@@ -1,7 +1,7 @@
+ use strict;
+ use warnings;
+
+-use Test::More 0.88;
++use Test::More tests => 2;
+ use lib 't/lib';
+ use Test::Class::Load ':all';
+ use Test::Fatal;
+@@ -24,5 +24,3 @@ like( exception {
+ like( exception {
+ load_class('Class::Load::SyntaxError');
+ }, qr/syntax error/ );
+-
+-done_testing;
+diff -up Class-Load-0.08/t/005-load-optional.t.orig Class-Load-0.08/t/005-load-optional.t
+--- Class-Load-0.08/t/005-load-optional.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/005-load-optional.t 2011-08-16 11:12:10.422565569 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+
+-use Test::More 0.88;
++use Test::More tests => 8;
+ use Test::Fatal;
+ use lib 't/lib';
+ use Test::Class::Load qw( :all );
+@@ -39,5 +39,3 @@ is( load_optional_class('Class::Load::Ve
+ 'VersionCheck (with too-high version) => 0');
+ is( load_optional_class('Class::Load::VersionCheck', {-version => 41}), 1,
+ 'VersionCheck (with ok version) => 1');
+-
+-done_testing;
+diff -up Class-Load-0.08/t/006-returned-error.t.orig Class-Load-0.08/t/006-returned-error.t
+--- Class-Load-0.08/t/006-returned-error.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/006-returned-error.t 2011-08-16 11:12:10.422565569 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More 0.88;
++use Test::More tests => 15;
+ use lib 't/lib';
+ use Test::Class::Load ':all';
+
+@@ -45,5 +45,3 @@ ok(!is_class_loaded('Class::Load::Syntax
+ ok(!try_load_class('Class::Load::Nonexistent'), "didn't load class Nonexistent");
+ is($@, "foo");
+ }
+-
+-done_testing;
+diff -up Class-Load-0.08/t/007-first-existing.t.orig Class-Load-0.08/t/007-first-existing.t
+--- Class-Load-0.08/t/007-first-existing.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/007-first-existing.t 2011-08-16 11:12:10.423565567 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use Test::Fatal;
+-use Test::More 0.88;
++use Test::More tests => 12;
+ use lib 't/lib';
+ use Test::Class::Load 'load_first_existing_class';
+
+@@ -120,5 +120,3 @@ is(
+ 'Class::Load::VersionCheck2',
+ 'load_first_existing_class returns loadable class when a class passes the version check'
+ );
+-
+-done_testing;
+diff -up Class-Load-0.08/t/008-gvstash-bug.t.orig Class-Load-0.08/t/008-gvstash-bug.t
+--- Class-Load-0.08/t/008-gvstash-bug.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/008-gvstash-bug.t 2011-08-16 11:12:10.423565567 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use Test::Fatal;
+-use Test::More 0.88;
++use Test::More tests => 3;
+ use lib 't/lib';
+ use Test::Class::Load 'load_class';
+
+@@ -20,5 +20,3 @@ is( exception {
+ Class::Load::Stash->a_method;
+ }, undef,
+ 'Actually loaded Class::Load::Stash - we were not fooled by mention of this stash in Class::Load::Stash::Sub' );
+-
+-done_testing;
+diff -up Class-Load-0.08/t/release-cpan-changes.t.orig Class-Load-0.08/t/release-cpan-changes.t
+--- Class-Load-0.08/t/release-cpan-changes.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/release-cpan-changes.t 2011-08-16 11:12:47.310490836 +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 -up Class-Load-0.08/t/release-pod-coverage.t.orig Class-Load-0.08/t/release-pod-coverage.t
+--- Class-Load-0.08/t/release-pod-coverage.t.orig 2011-08-16 03:19:07.000000000 +0100
++++ Class-Load-0.08/t/release-pod-coverage.t 2011-08-16 11:12:10.423565567 +0100
+@@ -11,7 +11,7 @@ BEGIN {
+ use strict;
+ use warnings;
+
+-use Test::More;
++use Test::More tests => 1;
+
+ use Test::Requires {
+ 'Test::Pod::Coverage' => '1.04',
+@@ -44,5 +44,3 @@ for my $module ( sort @modules ) {
+ "Pod coverage for $module"
+ );
+ }
+-
+-done_testing();
diff --git a/Class-Load-0.08-old-eu::mm.patch b/Class-Load-0.08-old-eu::mm.patch
new file mode 100644
index 0000000..042f782
--- /dev/null
+++ b/Class-Load-0.08-old-eu::mm.patch
@@ -0,0 +1,30 @@
+--- Class-Load/Makefile.PL
++++ Class-Load/Makefile.PL
+@@ -4,7 +4,7 @@
+
+
+
+-use ExtUtils::MakeMaker 6.30;
++use ExtUtils::MakeMaker;
+
+
+
+@@ -16,7 +16,7 @@
+ 'Test::More' => '0.88'
+ },
+ 'CONFIGURE_REQUIRES' => {
+- 'ExtUtils::MakeMaker' => '6.30'
++ 'ExtUtils::MakeMaker' => '0'
+ },
+ 'DISTNAME' => 'Class-Load',
+ 'EXE_FILES' => [],
+@@ -49,6 +49,9 @@
+ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+ unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+
++delete $WriteMakefileArgs{LICENSE}
++ unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
++
+ WriteMakefile(%WriteMakefileArgs);
+
+
diff --git a/Class-Load-0.08-stopwords.patch b/Class-Load-0.08-stopwords.patch
new file mode 100644
index 0000000..c74f640
--- /dev/null
+++ b/Class-Load-0.08-stopwords.patch
@@ -0,0 +1,13 @@
+--- Class-Load/t/release-pod-spell.t
++++ Class-Load/t/release-pod-spell.t
+@@ -40,7 +40,10 @@
+ UTC
+ ascii
+ attribute's
++behaviour
++blog
+ distro
++fallback
+ filename
+ inline
+ multipart
diff --git a/perl-Class-Load.spec b/perl-Class-Load.spec
index 8c15ed6..38c7f4d 100644
--- a/perl-Class-Load.spec
+++ b/perl-Class-Load.spec
@@ -1,17 +1,52 @@
Name: perl-Class-Load
-Version: 0.06
-Release: 5%{?dist}
+Version: 0.08
+Release: 1%{?dist}
Summary: A working (require "Class::Name") and more
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Class-Load/
-Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARTAK/Class-Load-%{version}.tar.gz
+Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Load-%{version}.tar.gz
+Patch0: Class-Load-0.08-old-Test::More.patch
+Patch2: Class-Load-0.08-old-eu::mm.patch
+Patch3: Class-Load-0.08-no-Test::Requires.patch
+Patch5: Class-Load-0.08-stopwords.patch
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
+# ===================================================================
+# Module build requirements
+# ===================================================================
BuildRequires: perl(ExtUtils::MakeMaker)
+# ===================================================================
+# Module requirements
+# ===================================================================
+BuildRequires: perl(Data::OptList)
+# ===================================================================
+# Regular test suite requirements
+# ===================================================================
BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::More)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl(version)
+# ===================================================================
+# Author/Release test requirements
+# ===================================================================
+BuildRequires: perl(Test::EOL)
+BuildRequires: perl(Test::NoTabs)
+BuildRequires: perl(Test::Pod)
+BuildRequires: perl(Test::Pod::Coverage)
+BuildRequires: perl(Test::Spelling), aspell-en
+# Modules not in EPEL-4
+%if 0%{?fedora} || 0%{?rhel} > 4
+BuildRequires: perl(Test::Requires)
+%endif
+# Modules not in EPEL-4/5/6
+%if 0%{?fedora} || 0%{?rhel} > 6
+BuildRequires: perl(Pod::Coverage::Moose)
+BuildRequires: perl(Test::CPAN::Changes)
+%endif
+# ===================================================================
+# Runtime requirements
+# ===================================================================
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
# Also requires core module perl(Exporter) via a "use base" construct
%description
@@ -30,6 +65,21 @@ provide is_class_loaded 'Class::Name'.
%prep
%setup -q -n Class-Load-%{version}
+# We need to patch the test suite if we have Test::More < 0.88
+%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
+%patch0 -p1
+%endif
+
+# Work around absence of Test::Requires and ancient ExtUtils::MakeMaker if necessary
+%if "%{?rhel}" == "4"
+%patch2 -p1
+%patch3 -p1
+%endif
+
+# Add extra stopwords to spell check test to account for dictionary
+# coverage differences between distros
+%patch5 -p1
+
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
@@ -42,18 +92,44 @@ find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
%{_fixperms} %{buildroot}
%check
-make test
+# Pod Coverage test breaks the build if we don't have Pod::Coverage::Moose
+%if ! 0%{?fedora} && 0%{?rhel} <= 6
+mv t/release-pod-coverage.t .
+%endif
+make test RELEASE_TESTING=1
+[ -f release-pod-coverage.t ] && mv release-pod-coverage.t t/
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc Changes
+%doc Changes LICENSE README
%{perl_vendorlib}/Class/
%{_mandir}/man3/Class::Load.3pm*
%changelog
+* Tue Aug 16 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.08-1
+- Update to 0.08:
+ - The previous version was missing a prereq declaration for Data::OptList
+ (CPAN RT#70285)
+- This release by DROLSKY -> update source URL
+- Package new documentation: LICENSE and README
+- Add build requirements for new release tests and run them:
+ - perl(Pod::Coverage::Moose)
+ - perl(Test::CPAN::Changes)
+ - perl(Test::EOL)
+ - perl(Test::NoTabs)
+ - perl(Test::Pod)
+ - perl(Test::Pod::Coverage)
+ - perl(Test::Requires)
+ - perl(Test::Spelling) and aspell-en
+- Add patch for building with ExtUtils::MakeMaker < 6.30
+- Add patch for building with Test::More < 0.88
+- Add patch for building without Test::Requires
+- Add patch for fixing spell checker word list
+- Don't try to run the POD Coverage test if we don't have Pod::Coverage::Moose
+
* Tue Jun 21 2011 Marcela Mašláňová <mmaslano@xxxxxxxxxx> - 0.06-5
- Perl mass rebuild
diff --git a/sources b/sources
index 1019f75..c6e0ba7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5aea2e7c66e69dafdbfedc00e93f9f46 Class-Load-0.06.tar.gz
+2b7d7c5faa72e14095f603a6a1e5496b Class-Load-0.08.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
