Update to 0.10

- New upstream release 0.10:
  - Fix is_class_loaded to ignore $ISA (but still look for @ISA) when trying to
    determine whether a class is loaded
  - Lots of internals cleanup
- BR: perl(Package::Stash) ≥ 0.32 and perl(Try::Tiny)
- Update patches to apply cleanly
epel9
Paul Howarth 14 years ago
parent cd10c7bd0c
commit 2cc49aa748

@ -1,30 +0,0 @@
--- 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);

@ -1,6 +1,6 @@
diff -up Class-Load-0.08/t/000-load.t.orig Class-Load-0.08/t/000-load.t diff -up Class-Load-0.09/t/000-load.t.orig Class-Load-0.09/t/000-load.t
--- Class-Load-0.08/t/000-load.t.orig 2011-08-16 03:19:07.000000000 +0100 --- Class-Load-0.09/t/000-load.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/000-load.t 2011-08-16 11:12:10.421565571 +0100 +++ Class-Load-0.09/t/000-load.t 2011-09-06 09:10:45.486039066 +0100
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
@ -15,9 +15,9 @@ diff -up Class-Load-0.08/t/000-load.t.orig Class-Load-0.08/t/000-load.t
diag('Using ' . Class::Load->_implementation() . ' implementation' ); diag('Using ' . Class::Load->_implementation() . ' implementation' );
- -
-done_testing; -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 diff -up Class-Load-0.09/t/001-is-class-loaded.t.orig Class-Load-0.09/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.09/t/001-is-class-loaded.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/001-is-class-loaded.t 2011-08-16 11:12:10.421565571 +0100 +++ Class-Load-0.09/t/001-is-class-loaded.t 2011-09-06 09:10:45.492039052 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
@ -27,15 +27,15 @@ diff -up Class-Load-0.08/t/001-is-class-loaded.t.orig Class-Load-0.08/t/001-is-c
use version; use version;
@@ -110,5 +110,3 @@ ok(!is_class_loaded('Class::Load::Versio @@ -105,5 +105,3 @@ ok(!is_class_loaded('Class::Load::Versio
'Class::Load::VersionCheck has been loaded but the version check failed'); 'Class::Load::VersionCheck has been loaded but the version check failed');
ok(is_class_loaded('Class::Load::VersionCheck', {-version => 41}), ok(is_class_loaded('Class::Load::VersionCheck', {-version => 41}),
'Class::Load::VersionCheck has been loaded and the version check passed'); 'Class::Load::VersionCheck has been loaded and the version check passed');
- -
-done_testing; -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 diff -up Class-Load-0.09/t/002-try-load-class.t.orig Class-Load-0.09/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.09/t/002-try-load-class.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/002-try-load-class.t 2011-08-16 11:12:10.421565571 +0100 +++ Class-Load-0.09/t/002-try-load-class.t 2011-09-06 09:10:45.492039052 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
@ -51,9 +51,9 @@ diff -up Class-Load-0.08/t/002-try-load-class.t.orig Class-Load-0.08/t/002-try-l
ok(!try_load_class('Class::Load::VersionCheck2', { -version => 43 })); ok(!try_load_class('Class::Load::VersionCheck2', { -version => 43 }));
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/003-load-class.t.orig Class-Load-0.08/t/003-load-class.t diff -up Class-Load-0.09/t/003-load-class.t.orig Class-Load-0.09/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.09/t/003-load-class.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/003-load-class.t 2011-08-16 11:12:10.422565569 +0100 +++ Class-Load-0.09/t/003-load-class.t 2011-09-06 09:10:45.493039049 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
@ -69,9 +69,9 @@ diff -up Class-Load-0.08/t/003-load-class.t.orig Class-Load-0.08/t/003-load-clas
}, qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm' ); }, qr/__PACKAGE__\.pm.*\@INC/, 'errors sanely on __PACKAGE__.pm' );
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/004-load-double.t.orig Class-Load-0.08/t/004-load-double.t diff -up Class-Load-0.09/t/004-load-double.t.orig Class-Load-0.09/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.09/t/004-load-double.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/004-load-double.t 2011-08-16 11:12:10.422565569 +0100 +++ Class-Load-0.09/t/004-load-double.t 2011-09-06 09:10:45.493039049 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
use strict; use strict;
use warnings; use warnings;
@ -87,9 +87,9 @@ diff -up Class-Load-0.08/t/004-load-double.t.orig Class-Load-0.08/t/004-load-dou
}, qr/syntax error/ ); }, qr/syntax error/ );
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/005-load-optional.t.orig Class-Load-0.08/t/005-load-optional.t diff -up Class-Load-0.09/t/005-load-optional.t.orig Class-Load-0.09/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.09/t/005-load-optional.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/005-load-optional.t 2011-08-16 11:12:10.422565569 +0100 +++ Class-Load-0.09/t/005-load-optional.t 2011-09-06 09:10:45.494039046 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; use warnings;
@ -105,9 +105,9 @@ diff -up Class-Load-0.08/t/005-load-optional.t.orig Class-Load-0.08/t/005-load-o
'VersionCheck (with ok version) => 1'); 'VersionCheck (with ok version) => 1');
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/006-returned-error.t.orig Class-Load-0.08/t/006-returned-error.t diff -up Class-Load-0.09/t/006-returned-error.t.orig Class-Load-0.09/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.09/t/006-returned-error.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/006-returned-error.t 2011-08-16 11:12:10.422565569 +0100 +++ Class-Load-0.09/t/006-returned-error.t 2011-09-06 09:10:45.494039046 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;
@ -123,9 +123,9 @@ diff -up Class-Load-0.08/t/006-returned-error.t.orig Class-Load-0.08/t/006-retur
} }
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/007-first-existing.t.orig Class-Load-0.08/t/007-first-existing.t diff -up Class-Load-0.09/t/007-first-existing.t.orig Class-Load-0.09/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.09/t/007-first-existing.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/007-first-existing.t 2011-08-16 11:12:10.423565567 +0100 +++ Class-Load-0.09/t/007-first-existing.t 2011-09-06 09:10:45.495039044 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; use warnings;
@ -141,9 +141,9 @@ diff -up Class-Load-0.08/t/007-first-existing.t.orig Class-Load-0.08/t/007-first
); );
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/008-gvstash-bug.t.orig Class-Load-0.08/t/008-gvstash-bug.t diff -up Class-Load-0.09/t/008-gvstash-bug.t.orig Class-Load-0.09/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.09/t/008-gvstash-bug.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/008-gvstash-bug.t 2011-08-16 11:12:10.423565567 +0100 +++ Class-Load-0.09/t/008-gvstash-bug.t 2011-09-06 09:10:45.495039044 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; use warnings;
@ -159,9 +159,30 @@ diff -up Class-Load-0.08/t/008-gvstash-bug.t.orig Class-Load-0.08/t/008-gvstash-
'Actually loaded Class::Load::Stash - we were not fooled by mention of this stash in Class::Load::Stash::Sub' ); 'Actually loaded Class::Load::Stash - we were not fooled by mention of this stash in Class::Load::Stash::Sub' );
- -
-done_testing; -done_testing;
diff -up Class-Load-0.08/t/release-cpan-changes.t.orig Class-Load-0.08/t/release-cpan-changes.t diff -up Class-Load-0.09/t/009-invalid-module-name.t.orig Class-Load-0.09/t/009-invalid-module-name.t
--- Class-Load-0.08/t/release-cpan-changes.t.orig 2011-08-16 03:19:07.000000000 +0100 --- Class-Load-0.09/t/009-invalid-module-name.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/release-cpan-changes.t 2011-08-16 11:12:47.310490836 +0100 +++ Class-Load-0.09/t/009-invalid-module-name.t 2011-09-06 13:22:19.205162393 +0100
@@ -2,14 +2,14 @@
use strict;
use warnings;
use Test::Fatal;
-use Test::More 0.88;
+use Test::More;
use lib 't/lib';
use Test::Class::Load 'load_class';
+plan tests => 1;
+
like(
exception { load_class('Foo:Bar') },
qr/^Foo:Bar is not a module name/,
"invalid module name"
);
-
-done_testing;
diff -up Class-Load-0.09/t/release-cpan-changes.t.orig Class-Load-0.09/t/release-cpan-changes.t
--- Class-Load-0.09/t/release-cpan-changes.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.09/t/release-cpan-changes.t 2011-09-06 09:10:45.496039042 +0100
@@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
#!perl #!perl
@ -183,9 +204,9 @@ diff -up Class-Load-0.08/t/release-cpan-changes.t.orig Class-Load-0.08/t/release
-plan skip_all => 'Test::CPAN::Changes required for this test' if $@; -plan skip_all => 'Test::CPAN::Changes required for this test' if $@;
changes_ok(); changes_ok();
-done_testing(); -done_testing();
diff -up Class-Load-0.08/t/release-pod-coverage.t.orig Class-Load-0.08/t/release-pod-coverage.t diff -up Class-Load-0.09/t/release-pod-coverage.t.orig Class-Load-0.09/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.09/t/release-pod-coverage.t.orig 2011-09-06 05:24:45.000000000 +0100
+++ Class-Load-0.08/t/release-pod-coverage.t 2011-08-16 11:12:10.423565567 +0100 +++ Class-Load-0.09/t/release-pod-coverage.t 2011-09-06 09:10:45.496039042 +0100
@@ -11,7 +11,7 @@ BEGIN { @@ -11,7 +11,7 @@ BEGIN {
use strict; use strict;
use warnings; use warnings;

@ -0,0 +1,11 @@
--- Class-Load/Makefile.PL
+++ Class-Load/Makefile.PL
@@ -4,7 +4,7 @@
-use ExtUtils::MakeMaker 6.30;
+use ExtUtils::MakeMaker;

@ -1,13 +1,13 @@
Name: perl-Class-Load Name: perl-Class-Load
Version: 0.08 Version: 0.10
Release: 1%{?dist} Release: 1%{?dist}
Summary: A working (require "Class::Name") and more Summary: A working (require "Class::Name") and more
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Class-Load/ URL: http://search.cpan.org/dist/Class-Load/
Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/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 Patch0: Class-Load-0.09-old-Test::More.patch
Patch2: Class-Load-0.08-old-eu::mm.patch Patch2: Class-Load-0.09-old-eu::mm.patch
Patch3: Class-Load-0.08-no-Test::Requires.patch Patch3: Class-Load-0.08-no-Test::Requires.patch
Patch5: Class-Load-0.08-stopwords.patch Patch5: Class-Load-0.08-stopwords.patch
BuildArch: noarch BuildArch: noarch
@ -20,6 +20,8 @@ BuildRequires: perl(ExtUtils::MakeMaker)
# Module requirements # Module requirements
# =================================================================== # ===================================================================
BuildRequires: perl(Data::OptList) BuildRequires: perl(Data::OptList)
BuildRequires: perl(Package::Stash) >= 0.32
BuildRequires: perl(Try::Tiny)
# =================================================================== # ===================================================================
# Regular test suite requirements # Regular test suite requirements
# =================================================================== # ===================================================================
@ -109,6 +111,14 @@ rm -rf %{buildroot}
%{_mandir}/man3/Class::Load.3pm* %{_mandir}/man3/Class::Load.3pm*
%changelog %changelog
* Tue Sep 6 2011 Paul Howarth <paul@city-fan.org> - 0.10-1
- Update to 0.10:
- Fix is_class_loaded to ignore $ISA (but still look for @ISA) when trying to
determine whether a class is loaded
- Lots of internals cleanup
- BR: perl(Package::Stash) ≥ 0.32 and perl(Try::Tiny)
- Update patches to apply cleanly
* Tue Aug 16 2011 Paul Howarth <paul@city-fan.org> - 0.08-1 * Tue Aug 16 2011 Paul Howarth <paul@city-fan.org> - 0.08-1
- Update to 0.08: - Update to 0.08:
- The previous version was missing a prereq declaration for Data::OptList - The previous version was missing a prereq declaration for Data::OptList

@ -1 +1 @@
2b7d7c5faa72e14095f603a6a1e5496b Class-Load-0.08.tar.gz 737bc23977e0240180954c2872faa50d Class-Load-0.10.tar.gz

Loading…
Cancel
Save