From 53ebaf1fe00c728542bd74d698da67e8e66dfb76 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 16 Feb 2010 08:13:56 +0000 Subject: [PATCH] - Fix FTBFS (#564718) by bumping buildreq version of perl(DateTime) from 0.4304 to 0.44 (RPM considers 0.4304 > 0.44, unlike perl) and bumping version to 1.1000 for compatibility with DateTime::Locale 0.43 (upstream ticket 19) - Update buildreq version requirement for perl(DateTime::Locale) to 0.43 - Drop test patch, no longer needed - Run additional tests for full locale coverage --- .cvsignore | 2 +- ...-Format-Strptime-004_locale_defaults.patch | 14 --------- perl-DateTime-Format-Strptime.spec | 29 ++++++++++++------- sources | 2 +- 4 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 perl-DateTime-Format-Strptime-004_locale_defaults.patch diff --git a/.cvsignore b/.cvsignore index 9c2ec53..47607a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -DateTime-Format-Strptime-1.0800.tgz +DateTime-Format-Strptime-1.1000.tgz diff --git a/perl-DateTime-Format-Strptime-004_locale_defaults.patch b/perl-DateTime-Format-Strptime-004_locale_defaults.patch deleted file mode 100644 index 9db61d7..0000000 --- a/perl-DateTime-Format-Strptime-004_locale_defaults.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- DateTime-Format-Strptime-1.0702/t/004_locale_defaults.t.orig 2007-09-17 19:16:15.000000000 -0500 -+++ DateTime-Format-Strptime-1.0702/t/004_locale_defaults.t 2008-07-08 11:46:16.000000000 -0500 -@@ -29,9 +29,9 @@ - ['en_GB', '%c', '31 Dec 1998 12:34:56'], - # French - #);my @tests = ( -- ['fr', '%x', '31 déc 1998'], -+ ['fr', '%x', '31 déc. 1998'], - ['fr', '%X', '12:34:56'], -- ['fr', '%c', '31 déc 1998 12:34:56'], -+ ['fr', '%c', '31 déc. 1998 12:34:56'], - ); - - foreach (@tests) { diff --git a/perl-DateTime-Format-Strptime.spec b/perl-DateTime-Format-Strptime.spec index b03fe36..c0fa402 100644 --- a/perl-DateTime-Format-Strptime.spec +++ b/perl-DateTime-Format-Strptime.spec @@ -1,16 +1,15 @@ Name: perl-DateTime-Format-Strptime -Version: 1.0800 -Release: 4%{?dist} +Version: 1.1000 +Release: 1%{?dist} Summary: Parse and format strp and strf time patterns License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/DateTime-Format-Strptime/ Source0: http://www.cpan.org/authors/id/R/RI/RICKM/DateTime-Format-Strptime-%{version}.tgz -Patch0: perl-DateTime-Format-Strptime-004_locale_defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(DateTime) >= 0.4304 -BuildRequires: perl(DateTime::Locale) >= 0.41 +BuildRequires: perl(DateTime) >= 0.44 +BuildRequires: perl(DateTime::Locale) >= 0.43 BuildRequires: perl(DateTime::TimeZone) >= 0.79 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Params::Validate) >= 0.64 @@ -25,7 +24,6 @@ returns the DateTime object associated. %prep %setup -q -n DateTime-Format-Strptime-%{version} -%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -43,6 +41,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %check make test +make test_more %clean rm -rf $RPM_BUILD_ROOT @@ -54,13 +53,21 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %changelog -* Mon Dec 7 2009 Stepan Kasal - 1.0800-4 -- rebuild against perl 5.10.1 +* Tue Feb 16 2010 Paul Howarth 1.1000-1 +- Fix FTBFS (#564718) by bumping buildreq version of perl(DateTime) from 0.4304 + to 0.44 (RPM considers 0.4304 > 0.44, unlike perl) and bumping version to + 1.1000 for compatibility with DateTime::Locale 0.43 (upstream ticket 19) +- Update buildreq version requirement for perl(DateTime::Locale) to 0.43 +- Drop test patch, no longer needed +- Run additional tests for full locale coverage -* Sat Jul 25 2009 Fedora Release Engineering - 1.0800-3 +* Mon Dec 7 2009 Stepan Kasal 1.0800-4 +- Rebuild against perl 5.10.1 + +* Sat Jul 25 2009 Fedora Release Engineering 1.0800-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Thu Feb 26 2009 Fedora Release Engineering - 1.0800-2 +* Thu Feb 26 2009 Fedora Release Engineering 1.0800-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Fri Aug 29 2008 Steven Pritchard 1.0800-1 @@ -71,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT - Patch t/004_locale_defaults.t to work around change in DateTime::Locale. * Tue Mar 04 2008 Tom "spot" Callaway 1.0702-2 -- rebuild for new perl +- Rebuild for new perl * Thu Jan 03 2008 Steven Pritchard 1.0702-1 - Update to 1.0702. diff --git a/sources b/sources index 9893d47..2b4d05f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -930bdda4cbf0e5414a70759861655a12 DateTime-Format-Strptime-1.0800.tgz +bf7f6b219e34411aa3f5d0de56fda393 DateTime-Format-Strptime-1.1000.tgz