From 5987a478c9577c62283f822f27e75a03dae5f4e2 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 14 Feb 2014 14:51:49 +0000 Subject: [PATCH] Update to 0.011 - New upstream release 0.011: - Generated from ETHER/YAML-Tiny-1.60.tar.gz - Give up trying to support EPEL (test suite now requires Test::More 0.99) --- CPAN-Meta-YAML-0.009-TM094.patch | 16 ------ CPAN-Meta-YAML-0.009-old-Test::More.patch | 10 ---- perl-CPAN-Meta-YAML.spec | 66 ++++++++++++----------- sources | 2 +- 4 files changed, 36 insertions(+), 58 deletions(-) delete mode 100644 CPAN-Meta-YAML-0.009-TM094.patch delete mode 100644 CPAN-Meta-YAML-0.009-old-Test::More.patch diff --git a/CPAN-Meta-YAML-0.009-TM094.patch b/CPAN-Meta-YAML-0.009-TM094.patch deleted file mode 100644 index 0a4c425..0000000 --- a/CPAN-Meta-YAML-0.009-TM094.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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; diff --git a/CPAN-Meta-YAML-0.009-old-Test::More.patch b/CPAN-Meta-YAML-0.009-old-Test::More.patch deleted file mode 100644 index 18add0e..0000000 --- a/CPAN-Meta-YAML-0.009-old-Test::More.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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(); diff --git a/perl-CPAN-Meta-YAML.spec b/perl-CPAN-Meta-YAML.spec index 85adb4d..23d59dc 100644 --- a/perl-CPAN-Meta-YAML.spec +++ b/perl-CPAN-Meta-YAML.spec @@ -1,41 +1,54 @@ -# 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.010 +Version: 0.011 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.009-TM094.patch -Patch1: CPAN-Meta-YAML-0.009-old-Test::More.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch +# Build: +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.17 +# Module Runtime: +BuildRequires: perl(B) BuildRequires: perl(Carp) BuildRequires: perl(Exporter) -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(File::Spec) +BuildRequires: perl(Fcntl) +BuildRequires: perl(Scalar::Util) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Tests: -BuildRequires: perl(IO::Handle) -BuildRequires: perl(IPC::Open3) +# CPAN::Meta requires CPAN::Meta::YAML +%if 0%{!?perl_bootstrap:1} +BuildRequires: perl(CPAN::Meta) +BuildRequires: perl(CPAN::Meta::Requirements) >= 2.120900 +%endif +BuildRequires: perl(File::Basename) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Spec) BuildRequires: perl(File::Spec::Functions) BuildRequires: perl(File::Temp) -BuildRequires: perl(Test::More) +BuildRequires: perl(Getopt::Long) +BuildRequires: perl(IO::Dir) +BuildRequires: perl(JSON::PP) +BuildRequires: perl(lib) +BuildRequires: perl(List::Util) +BuildRequires: perl(Test::More) >= 0.99 +BuildRequires: perl(utf8) +BuildRequires: perl(vars) +BuildRequires: perl(version) BuildRequires: perl(YAML) +# Extra Tests: # Don't run extra tests when bootstrapping as many of those # tests' dependencies build-require this package -%if 0%{?fedora} && 0%{!?perl_bootstrap:1} +%if 0%{!?perl_bootstrap:1} BuildRequires: perl(Test::CPAN::Meta) BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Requires) +BuildRequires: perl(Test::Portability::Files) BuildRequires: perl(Test::Version) %endif Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Carp) -Requires: perl(Exporter) %description This module implements a subset of the YAML specification for use in reading @@ -45,41 +58,32 @@ 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.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 -%endif - %build perl Makefile.PL INSTALLDIRS=vendor UNINST=0 make %{?_smp_mflags} %install -rm -rf %{buildroot} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} \; %{_fixperms} %{buildroot} %check make test -%if 0%{?fedora} && 0%{!?perl_bootstrap:1} +%if 0%{!?perl_bootstrap:1} make test TEST_FILES="xt/*/*.t" %endif -%clean -rm -rf %{buildroot} - %files %doc Changes LICENSE README %{perl_vendorlib}/CPAN/ %{_mandir}/man3/CPAN::Meta::YAML.3pm* %changelog +* Fri Feb 14 2014 Paul Howarth - 0.011-1 +- Update to 0.011: + - Generated from ETHER/YAML-Tiny-1.60.tar.gz +- Give up trying to support EPEL (test suite now requires Test::More 0.99) + * Mon Sep 23 2013 Paul Howarth - 0.010-1 - Update to 0.010: - Generated from ETHER/YAML-Tiny-1.55.tar.gz diff --git a/sources b/sources index b6afd18..45489ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e2efc852f9ad3d01496fa9ccdc9dc3a CPAN-Meta-YAML-0.010.tar.gz +a147b4a7218af8137f09f3f72364cb25 CPAN-Meta-YAML-0.011.tar.gz