Update to 0.010

- New upstream release 0.010: - Generated from ETHER/YAML-Tiny-1.55.tar.gz - Makefile.PL will use UNINST=1 on old perls that might have an old version incorrectly installed into the core library path - Updated Makefile.PL logic to support PERL_NO_HIGHLANDER - Drop redundant BRs: perl(Pod::Wordlist::hanekomu), perl(Test::Requires), perl(Test::Spelling) and aspell-en - Add new test dependencies perl(IO::Handle) and perl(IPC::Open3) - Build with UNINST=0 to avoid build failures as we can't remove the system version of the package when building an rpm for a new version - Update patch for building with old Test::More, and add new patch to support building with Test::More < 0.94 - Don't run the extra tests in EPEL as we don't have Test::Version there
2013-09-23 22:02:17 +01:00 · 2013-09-23 22:02:17 +01:00 · 0d23f9b5b3
commit 0d23f9b5b3
parent 76d77d22a0
5 changed files with 60 additions and 31 deletions
--- a/CPAN-Meta-YAML-0.006-old-Test::More.patch
+++ b/CPAN-Meta-YAML-0.006-old-Test::More.patch
@ -1,10 +0,0 @@
-diff -up CPAN-Meta-YAML-0.006/xt/release/test-version.t.orig CPAN-Meta-YAML-0.006/xt/release/test-version.t
--- CPAN-Meta-YAML-0.006/xt/release/test-version.t.orig	2012-02-07 01:51:53.000000000 +0000
-+++ CPAN-Meta-YAML-0.006/xt/release/test-version.t	2012-02-07 11:48:13.912695104 +0000
-@@ -8,5 +8,5 @@ use Test::Requires {
-     'Test::Version' => 0.04,
- };
- 
-+plan tests => 2;
- version_all_ok;
-done_testing;
--- a/CPAN-Meta-YAML-0.009-TM094.patch
+++ b/CPAN-Meta-YAML-0.009-TM094.patch
@ -0,0 +1,16 @@
+--- t/00-compile.t
+++ t/00-compile.t
+@@ -3,7 +3,7 @@
+ 
+ # this test was generated with Dist::Zilla::Plugin::Test::Compile 2.030
+ 
+-use Test::More 0.94 tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
+use Test::More 0.47 tests => 1 + ($ENV{AUTHOR_TESTING} ? 1 : 0);
+ 
+ 
+ 
+@@ -41,4 +41,3 @@
+ 
+ is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING};
+ 
+-BAIL_OUT("Compilation problems") if !Test::More->builder->is_passing;
--- a/CPAN-Meta-YAML-0.009-old-Test::More.patch
+++ b/CPAN-Meta-YAML-0.009-old-Test::More.patch
@ -0,0 +1,10 @@
+--- xt/release/test-version.t
+++ xt/release/test-version.t
+@@ -18,5 +18,5 @@ push @imports, $params
+ 
+ Test::Version->import(@imports);
+ 
+-version_all_ok;
+-done_testing;
+plan tests => 2;
+version_all_ok();
--- a/perl-CPAN-Meta-YAML.spec
+++ b/perl-CPAN-Meta-YAML.spec
@ -1,15 +1,17 @@
-# We need to patch the test suite if we have Test::More < 0.88
+# We need to patch the test suite if we have Test::More < 0.94
+%global quite_old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.94) ? 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)

 Name:		perl-CPAN-Meta-YAML
-Version:	0.008
-Release:	292%{?dist}
+Version:	0.010
+Release:	1%{?dist}
 Summary:	Read and write a subset of YAML for CPAN Meta files
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/CPAN-Meta-YAML/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-%{version}.tar.gz
-Patch1:		CPAN-Meta-YAML-0.006-old-Test::More.patch
+Patch0:		CPAN-Meta-YAML-0.009-TM094.patch
+Patch1:		CPAN-Meta-YAML-0.009-old-Test::More.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(Carp)
@ -17,29 +19,20 @@ BuildRequires:	perl(Exporter)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(File::Spec)
 # Tests:
+BuildRequires:	perl(IO::Handle)
+BuildRequires:	perl(IPC::Open3)
 BuildRequires:	perl(File::Spec::Functions)
 BuildRequires:	perl(File::Temp)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(YAML)
 # Don't run extra tests when bootstrapping as many of those
 # tests' dependencies build-require this package
-%if 0%{!?perl_bootstrap:1}
-# RHEL-7 package cannot have buildreqs from EPEL-7 (aspell-en, Pod::Wordlist::hanekomu),
-# so skip the spell check there
-%if 0%{?rhel} < 7
-# Version 1.113620 needed for "UTF"
-BuildRequires:	perl(Pod::Wordlist::hanekomu) >= 1.113620
-BuildRequires:	perl(Test::Spelling), aspell-en
-%endif
+%if 0%{?fedora} && 0%{!?perl_bootstrap:1}
 BuildRequires:	perl(Test::CPAN::Meta)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Requires)
-# RHEL ≤ 6 doesn't have a recent enough perl(version) for perl(Test::Version) in EPEL
-# RHEL ≥ 7 includes this package but does not have perl(Test::Version)
-%if 0%{?fedora}
 BuildRequires:	perl(Test::Version)
 %endif
-%endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:	perl(Carp)
 Requires:	perl(Exporter)
@ -52,13 +45,18 @@ used for any other general YAML parsing or generation task.
 %prep
 %setup -q -n CPAN-Meta-YAML-%{version}

-# We need to patch the test suite if we have Test::More < 0.88
+# We need to patch the test suite if we have Test::More < 0.94
+%if %{quite_old_test_more}
+%patch0
+%endif
+
+# We need to patch the test suite again if we have Test::More < 0.88
 %if %{old_test_more}
-%patch1 -p1
+%patch1
 %endif

 %build
-perl Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor UNINST=0
 make %{?_smp_mflags}

 %install
@ -69,7 +67,7 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;

 %check
 make test
-%if 0%{!?perl_bootstrap:1}
+%if 0%{?fedora} && 0%{!?perl_bootstrap:1}
 make test TEST_FILES="xt/*/*.t"
 %endif

@ -82,6 +80,21 @@ rm -rf %{buildroot}
 %{_mandir}/man3/CPAN::Meta::YAML.3pm*

 %changelog
+* Mon Sep 23 2013 Paul Howarth <paul@city-fan.org> - 0.010-1
+- Update to 0.010:
+  - Generated from ETHER/YAML-Tiny-1.55.tar.gz
+  - Makefile.PL will use UNINST=1 on old perls that might have an old version
+    incorrectly installed into the core library path
+  - Updated Makefile.PL logic to support PERL_NO_HIGHLANDER
+- Drop redundant BRs: perl(Pod::Wordlist::hanekomu), perl(Test::Requires),
+  perl(Test::Spelling) and aspell-en
+- Add new test dependencies perl(IO::Handle) and perl(IPC::Open3)
+- Build with UNINST=0 to avoid build failures as we can't remove the system
+  version of the package when building an rpm for a new version
+- Update patch for building with old Test::More, and add new patch to support
+  building with Test::More < 0.94
+- Don't run the extra tests in EPEL as we don't have Test::Version there
+
 * Wed Aug 14 2013 Jitka Plesnikova <jplesnik@redhat.com> - 0.008-292
 - Perl 5.18 re-rebuild of bootstrapped packages

--- a/2
+++ b/2
@ -1 +1 @@
-06211d8492f23c68aadb83670451284d  CPAN-Meta-YAML-0.008.tar.gz
+5e2efc852f9ad3d01496fa9ccdc9dc3a  CPAN-Meta-YAML-0.010.tar.gz