From 2dbaa38bb8d18bcc8b99ee8a174fcd61a433c71e Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 17 May 2006 19:14:32 +0000 Subject: [PATCH] Revert to 0.39 temporarily. --- perl-YAML-testmore054.patch | 15 +++++++++++++++ perl-YAML.spec | 38 ++++++++++++++++++------------------- sources | 2 +- 3 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 perl-YAML-testmore054.patch diff --git a/perl-YAML-testmore054.patch b/perl-YAML-testmore054.patch new file mode 100644 index 0000000..67afbad --- /dev/null +++ b/perl-YAML-testmore054.patch @@ -0,0 +1,15 @@ +--- t/20load.t~ 2005-03-31 05:18:43.000000000 +0300 ++++ t/20load.t 2005-04-13 17:35:47.000000000 +0300 +@@ -1,7 +1,11 @@ + use lib 'lib', 't'; + use TestChunks; + plan tests => number_of_tests; +-test_load; ++SKIP: { ++ Test::More::skip "This test hangs with Test::More < 0.54", number_of_tests ++ unless $Test::More::VERSION && $Test::More::VERSION >= 0.54; ++ test_load; ++}; + + __DATA__ + === diff --git a/perl-YAML.spec b/perl-YAML.spec index 5ae9378..61002ee 100644 --- a/perl-YAML.spec +++ b/perl-YAML.spec @@ -1,15 +1,18 @@ Name: perl-YAML -Version: 0.58 +Version: 0.39 Release: 2%{?dist} Summary: YAML Ain't Markup Language (tm) -License: GPL or Artistic + Group: Development/Libraries +License: GPL or Artistic URL: http://search.cpan.org/dist/YAML/ Source0: http://www.cpan.org/authors/id/I/IN/INGY/YAML-%{version}.tar.gz +Patch0: %{name}-testmore054.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + BuildArch: noarch -BuildRequires: perl(Test::Base) >= 0.49 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl >= 1:5.6.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The YAML.pm module implements a YAML Loader and Dumper based on the @@ -20,48 +23,43 @@ most modern programming languages, including Perl. For information on the YAML syntax, please refer to the YAML specification. + %prep %setup -q -n YAML-%{version} +%patch0 -p0 + %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT - make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \; -chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* - -%check +%check || : make test + %clean rm -rf $RPM_BUILD_ROOT + %files %defattr(-,root,root,-) %doc Changes README %{_bindir}/ysh %{perl_vendorlib}/YAML* -%{perl_vendorlib}/Test/YAML* %{_mandir}/man1/ysh.1* %{_mandir}/man3/YAML*.3* -%{_mandir}/man3/Test::YAML*.3* + %changelog -* Tue May 09 2006 Steven Pritchard 0.58-2 -- Drop testmore patch. -- Catch Test::YAML module and man page in file list. - -* Thu May 04 2006 Steven Pritchard 0.58-1 -- Update to 0.58. -- Small spec cleanups. - * Thu Apr 14 2005 Ville Skyttä - 0.39-2 - 0.39. diff --git a/sources b/sources index e1a847f..d6b8b8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa5ac653057914ca995dd74de8212ebc YAML-0.58.tar.gz +b8a49f49cb0ee6d9698807fb3f606922 YAML-0.39.tar.gz