Update to 0.09
- New upstream release 0.09 - Implemented and then reverted a change to use Sub::Name (CPAN RT#98097) - Modernize spec - Hack out references to currently-unavailable Test::CleanNamespaces
This commit is contained in:
Paul Howarth
parent
c3c7975f2b
commit
541b0187d5
|
|
@ -1,174 +0,0 @@
|
|||
diff -up ./t/basic.t.orig ./t/basic.t
|
||||
--- ./t/basic.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/basic.t 2013-07-15 13:55:40.798191023 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 5;
|
||||
|
||||
{
|
||||
package T;
|
||||
@@ -33,5 +33,3 @@ use Test::More 0.88;
|
||||
'T::_implementation returns default implementation'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/both-fail.t.orig ./t/both-fail.t
|
||||
--- ./t/both-fail.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/both-fail.t 2013-07-15 13:55:40.798191023 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 1;
|
||||
use Test::Fatal 0.006;
|
||||
|
||||
{
|
||||
@@ -24,5 +24,3 @@ use Test::Fatal 0.006;
|
||||
'Got an exception when all implementations fail to load'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/env-value.t.orig ./t/env-value.t
|
||||
--- ./t/env-value.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/env-value.t 2013-07-15 13:55:40.799191020 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 4;
|
||||
|
||||
{
|
||||
package T;
|
||||
@@ -35,5 +35,3 @@ use Test::More 0.88;
|
||||
'T::_implementation returns implementation set in ENV'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/more-symbols.t.orig ./t/more-symbols.t
|
||||
--- ./t/more-symbols.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/more-symbols.t 2013-07-15 13:55:40.799191020 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 7;
|
||||
|
||||
{
|
||||
package T;
|
||||
@@ -43,5 +43,3 @@ use Test::More 0.88;
|
||||
'%T::HASH was copied from implementation'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/one-impl-fails1.t.orig ./t/one-impl-fails1.t
|
||||
--- ./t/one-impl-fails1.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/one-impl-fails1.t 2013-07-15 13:55:40.799191020 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 2;
|
||||
|
||||
{
|
||||
package T;
|
||||
@@ -24,5 +24,3 @@ use Test::More 0.88;
|
||||
ok( T->can('return_42'), 'T package has a return_42 sub' );
|
||||
ok( !T->can('return_package'), 'T package has a return_package sub' );
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/one-impl-fails2.t.orig ./t/one-impl-fails2.t
|
||||
--- ./t/one-impl-fails2.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/one-impl-fails2.t 2013-07-15 13:55:40.799191020 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 2;
|
||||
|
||||
{
|
||||
package T;
|
||||
@@ -24,5 +24,3 @@ use Test::More 0.88;
|
||||
ok( T->can('return_42'), 'T package has a return_42 sub' );
|
||||
ok( !T->can('return_package'), 'T package has a return_package sub' );
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/release-cpan-changes.t.orig ./t/release-cpan-changes.t
|
||||
--- ./t/release-cpan-changes.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/release-cpan-changes.t 2013-07-15 13:56:13.666095355 +0100
|
||||
@@ -1,19 +1,16 @@
|
||||
#!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 strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.96 tests => 2;
|
||||
-use_ok('Test::CPAN::Changes');
|
||||
-subtest 'changes_ok' => sub {
|
||||
- changes_file_ok('Changes');
|
||||
-};
|
||||
-done_testing();
|
||||
+plan tests => 4;
|
||||
+changes_file_ok('Changes');
|
||||
diff -up ./t/requested-fails.t.orig ./t/requested-fails.t
|
||||
--- ./t/requested-fails.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/requested-fails.t 2013-07-15 13:55:40.800191017 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 1;
|
||||
use Test::Fatal 0.006;
|
||||
|
||||
{
|
||||
@@ -26,5 +26,3 @@ use Test::Fatal 0.006;
|
||||
'Got an exception when implementation requested in env value fails to load'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
diff -up ./t/taint.t.orig ./t/taint.t
|
||||
--- ./t/taint.t.orig 2013-07-14 17:58:57.000000000 +0100
|
||||
+++ ./t/taint.t 2013-07-15 13:55:40.800191017 +0100
|
||||
@@ -7,7 +7,7 @@ use Test::Requires {
|
||||
'Test::Taint' => '0',
|
||||
};
|
||||
|
||||
-use Test::More 0.88;
|
||||
+use Test::More tests => 4;
|
||||
use Test::Fatal 0.006;
|
||||
|
||||
taint_checking_ok();
|
||||
@@ -44,5 +44,3 @@ taint_checking_ok();
|
||||
'T::_implementation returns implementation set in ENV'
|
||||
);
|
||||
}
|
||||
-
|
||||
-done_testing();
|
||||
|
|
@ -1,27 +1,20 @@
|
|||
# We need to patch the test suite if we have an old version of Test::More
|
||||
%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.96) ? 1 : 0);' 2>/dev/null || echo 0)
|
||||
|
||||
# Test::CPAN::Changes isn't available in EPEL < 7, due to requirement of perl(version) ≥ 0.79
|
||||
%global cpan_changes_available %(expr 0%{?fedora} + 0%{?rhel} '>' 6)
|
||||
|
||||
#TODO: BR: Test::Pod::No404s when available
|
||||
#TODO: BR: Test::Pod::LinkCheck when available
|
||||
#TODO: BR: Test::CleanNamespaces when available
|
||||
|
||||
Name: perl-Module-Implementation
|
||||
Version: 0.07
|
||||
Release: 6%{?dist}
|
||||
Version: 0.09
|
||||
Release: 1%{?dist}
|
||||
Summary: Loads one of several alternate underlying implementations for a module
|
||||
Group: Development/Libraries
|
||||
License: Artistic 2.0
|
||||
URL: http://search.cpan.org/dist/perl-Module-Implementation/
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Module-Implementation-%{version}.tar.gz
|
||||
Patch1: Module-Implementation-0.07-old-Test::More.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
|
||||
BuildArch: noarch
|
||||
# ===================================================================
|
||||
# Build requirements
|
||||
# ===================================================================
|
||||
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.30
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
# ===================================================================
|
||||
# Module requirements
|
||||
# ===================================================================
|
||||
|
|
@ -33,34 +26,36 @@ BuildRequires: perl(warnings)
|
|||
# ===================================================================
|
||||
# Test suite requirements
|
||||
# ===================================================================
|
||||
BuildRequires: perl(File::Find)
|
||||
BuildRequires: perl(File::Temp)
|
||||
BuildRequires: perl(File::Spec)
|
||||
BuildRequires: perl(IO::Handle)
|
||||
BuildRequires: perl(IPC::Open3)
|
||||
BuildRequires: perl(lib)
|
||||
BuildRequires: perl(Test::Fatal) >= 0.006
|
||||
BuildRequires: perl(Test::More)
|
||||
BuildRequires: perl(Test::More) >= 0.96
|
||||
BuildRequires: perl(Test::Requires)
|
||||
# ===================================================================
|
||||
# Optional test requirements
|
||||
# ===================================================================
|
||||
BuildRequires: perl(CPAN::Meta) >= 2.120900
|
||||
BuildRequires: perl(Test::Taint)
|
||||
# ===================================================================
|
||||
# Author/Release test requirements
|
||||
# ===================================================================
|
||||
# Release tests include circular dependencies, so don't do them when bootstrapping:
|
||||
# Test::CPAN::Changes -> Moo -> stricture -> indirect -> Test::Kwalitee ->
|
||||
# namespace::clean -> [B::Hooks::EndOfScope|Package::Stash] -> Module::Implementation
|
||||
%if ! %{defined perl_bootstrap}
|
||||
%if %{cpan_changes_available}
|
||||
BuildRequires: perl(Test::CPAN::Changes) >= 0.19
|
||||
%endif
|
||||
BuildRequires: perl(Pod::Coverage::TrustPod)
|
||||
BuildRequires: perl(Test::CPAN::Changes) >= 0.19
|
||||
BuildRequires: perl(Test::EOL)
|
||||
BuildRequires: perl(Test::NoTabs)
|
||||
BuildRequires: perl(Test::Pod)
|
||||
BuildRequires: perl(Test::Pod::Coverage)
|
||||
# Can't use aspell-en from EPEL as BR: for RHEL-7+ package, and older EL
|
||||
# releases don't have recent enough Test::Spelling so skip author tests
|
||||
# there
|
||||
BuildRequires: perl(Test::Pod) >= 1.41
|
||||
BuildRequires: perl(Test::Pod::Coverage) >= 1.08
|
||||
BuildRequires: perl(Test::Portability::Files)
|
||||
# Can't use EPEL packages as BR: for RHEL package
|
||||
%if ! 0%{?rhel}
|
||||
BuildRequires: aspell-en
|
||||
BuildRequires: perl(Pod::Wordlist::hanekomu)
|
||||
BuildRequires: perl(Pod::Wordlist)
|
||||
BuildRequires: perl(Test::Pod::LinkCheck)
|
||||
BuildRequires: perl(Test::Pod::No404s)
|
||||
BuildRequires: perl(Test::Spelling) >= 0.12
|
||||
%endif
|
||||
%endif
|
||||
|
|
@ -84,17 +79,15 @@ something like a plugin system, not this module.
|
|||
%prep
|
||||
%setup -q -n Module-Implementation-%{version}
|
||||
|
||||
# We have to patch the test suite if we have an old Test::More
|
||||
%if %{old_test_more}
|
||||
%patch1 -p1
|
||||
%endif
|
||||
# Can't try namespace-cleanliness.t until we have Test::CleanNamespaces
|
||||
sed -i -e '/namespace-cleanliness.t/d' MANIFEST t/00-report-prereqs.t t/author-no-tabs.t
|
||||
rm t/namespace-cleanliness.t
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make pure_install DESTDIR=%{buildroot}
|
||||
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
|
||||
%{_fixperms} %{buildroot}
|
||||
|
|
@ -111,15 +104,19 @@ make test RELEASE_TESTING=1
|
|||
%endif
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%doc Changes LICENSE README
|
||||
%license LICENSE
|
||||
%doc Changes README.md
|
||||
%{perl_vendorlib}/Module/
|
||||
%{_mandir}/man3/Module::Implementation.3pm*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 8 2014 Paul Howarth <paul@city-fan.org> - 0.09-1
|
||||
- Update to 0.09
|
||||
- Implemented and then reverted a change to use Sub::Name (CPAN RT#98097)
|
||||
- Modernize spec
|
||||
- Hack out references to currently-unavailable Test::CleanNamespaces
|
||||
|
||||
* Fri Aug 29 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.07-6
|
||||
- Perl 5.20 rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue