commit 24eecf45cfb7a1b5036154c738110aa71327dca5
Author: Paul Howarth <p...@city-fan.org>
Date: Wed Sep 7 14:26:44 2011 +0100
Update to 0.004
- New upstream release 0.004
- Generated from ADAMK/YAML-Tiny-1.50.tar.gz
- BR: perl(Test::Version) for additional test coverage
- Update patch for building with ExtUtils::MakeMaker < 6.30
- Add patch to support building with Test::More < 0.88
- Add patch to fix operation with Scalar::Util < 1.18
.gitignore | 1 +
CPAN-Meta-YAML-0.003-old-EU::MM.patch | 30 ---------------------
CPAN-Meta-YAML-0.004-old-EU::MM.patch | 11 ++++++++
CPAN-Meta-YAML-0.004-old-Scalar::Util.patch | 13 +++++++++
CPAN-Meta-YAML-0.004-old-Test::More.patch | 10 +++++++
perl-CPAN-Meta-YAML.spec | 37 ++++++++++++++++++++++----
sources | 2 +-
7 files changed, 67 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c0baf4..2191ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/CPAN-Meta-YAML-0.003.tar.gz
+/CPAN-Meta-YAML-0.004.tar.gz
diff --git a/CPAN-Meta-YAML-0.004-old-EU::MM.patch
b/CPAN-Meta-YAML-0.004-old-EU::MM.patch
new file mode 100644
index 0000000..a60208e
--- /dev/null
+++ b/CPAN-Meta-YAML-0.004-old-EU::MM.patch
@@ -0,0 +1,11 @@
+--- CPAN-Meta-YAML/Makefile.PL
++++ CPAN-Meta-YAML/Makefile.PL
+@@ -4,7 +4,7 @@
+
+ use 5.004;
+
+-use ExtUtils::MakeMaker 6.30;
++use ExtUtils::MakeMaker;
+
+
+
diff --git a/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
b/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
new file mode 100644
index 0000000..dd5b410
--- /dev/null
+++ b/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
@@ -0,0 +1,13 @@
+This bug inherited from YAML::Tiny 1.50, which I'd forgotten to report
upstream.
+
+--- CPAN-Meta-YAML-0.004/lib/CPAN/Meta/YAML.pm
++++ CPAN-Meta-YAML-0.004/lib/CPAN/Meta/YAML.pm
+@@ -615,7 +615,7 @@
+ require Scalar::Util;
+ };
+ if ( $@ or $Scalar::Util::VERSION < 1.18 ) {
+- eval <<'END_PERL' if $@;
++ eval <<'END_PERL';
+ # Scalar::Util failed to load or too old
+ sub refaddr {
+ my $pkg = ref($_[0]) or return undef;
diff --git a/CPAN-Meta-YAML-0.004-old-Test::More.patch
b/CPAN-Meta-YAML-0.004-old-Test::More.patch
new file mode 100644
index 0000000..0922d4f
--- /dev/null
+++ b/CPAN-Meta-YAML-0.004-old-Test::More.patch
@@ -0,0 +1,10 @@
+--- CPAN-Meta-YAML-0.004/xt/release/test-version.t.orig 2011-09-06
14:42:59.000000000 +0100
++++ CPAN-Meta-YAML-0.004/xt/release/test-version.t 2011-09-07
13:22:05.882101877 +0100
+@@ -8,5 +8,6 @@
+ plan skip_all => "Test::Version 0.04 required for testing versions"
+ if $@;
+
++plan tests => 1;
++
+ version_all_ok();
+-done_testing;
diff --git a/perl-CPAN-Meta-YAML.spec b/perl-CPAN-Meta-YAML.spec
index 1e1fab5..1ad267e 100644
--- a/perl-CPAN-Meta-YAML.spec
+++ b/perl-CPAN-Meta-YAML.spec
@@ -1,15 +1,20 @@
-# We don't really need ExtUtils::MakeMaker ≥ 6.31
-%global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n",
$ExtUtils::MakeMaker::VERSION < 6.31 ? 1 : 0;' 2>/dev/null || echo 0)
+# We don't really need ExtUtils::MakeMaker ≥ 6.30
+%global old_eumm %(perl -MExtUtils::MakeMaker -e 'print
(($ExtUtils::MakeMaker::VERSION < 6.30) ? 1 : 0);' 2>/dev/null || echo 0)
+
+# We need to patch the test suite if we have Test::More < 0.88
+%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.003
-Release: 7%{?dist}
+Version: 0.004
+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
-Patch0: CPAN-Meta-YAML-0.003-old-EU::MM.patch
+Patch0: CPAN-Meta-YAML-0.004-old-EU::MM.patch
+Patch1: CPAN-Meta-YAML-0.004-old-Test::More.patch
+Patch2: CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
@@ -17,6 +22,10 @@ BuildRequires: perl(File::Spec)
BuildRequires: perl(Test::CPAN::Meta)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
+# RHEL <= 6 doesn't have a recent enough perl(version) for perl(Test::Version)
+%if 0%{?fedora} || 0%{?rhel} > 6
+BuildRequires: perl(Test::Version)
+%endif
BuildRequires: perl(YAML)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -28,11 +37,19 @@ used for any other general YAML parsing or generation task.
%prep
%setup -q -n CPAN-Meta-YAML-%{version}
-# We don't really need ExtUtils::MakeMaker ≥ 6.31
+# We don't really need ExtUtils::MakeMaker ≥ 6.30
%if %{old_eumm}
%patch0 -p1
%endif
+# We need to patch the test suite if we have Test::More < 0.88
+%if %{old_test_more}
+%patch1 -p1
+%endif
+
+# Fix operation with Scalar::Util < 1.18 properly (CPAN RT#53490)
+%patch2 -p1
+
%build
perl Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}
@@ -57,6 +74,14 @@ rm -rf %{buildroot}
%{_mandir}/man3/CPAN::Meta::YAML.3pm*
%changelog
+* Wed Sep 7 2011 Paul Howarth <p...@city-fan.org> - 0.004-1
+- Update to 0.004:
+ - Generated from ADAMK/YAML-Tiny-1.50.tar.gz
+- BR: perl(Test::Version) for additional test coverage
+- Update patch for building with ExtUtils::MakeMaker < 6.30
+- Add patch to support building with Test::More < 0.88
+- Add patch to fix operation with Scalar::Util < 1.18
+
* Tue Aug 16 2011 Marcela Mašláňová <mmasl...@redhat.com> - 0.003-7
- Install to vendor perl directories to avoid potential debuginfo conflicts
with the main perl package if this module ever becomes arch-specific
diff --git a/sources b/sources
index 8e7c671..c0cb032 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62d0f9726a2b91971b2f3f4ac770de5d CPAN-Meta-YAML-0.003.tar.gz
+120025b9fd39b9dbfeb6ffc5f4a2dd8d CPAN-Meta-YAML-0.004.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
