rpms/grepmail/devel grepmail-5.3034-date-manip-6.patch, NONE, 1.1 grepmail.spec, 1.13, 1.14

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/grepmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23852

Modified Files:
	grepmail.spec 
Added Files:
	grepmail-5.3034-date-manip-6.patch 
Log Message:
Fix incompatibilities with Date::Manip 6.x (#564839, CPAN RT#54621)

grepmail-5.3034-date-manip-6.patch:
 grepmail |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE grepmail-5.3034-date-manip-6.patch ---
--- grepmail-5.3034/grepmail.orig	2009-08-16 21:26:03.000000000 +0100
+++ grepmail-5.3034/grepmail	2010-02-15 13:46:52.674267600 +0000
@@ -394,7 +394,7 @@
     if (eval 'require Date::Manip')
     {
       my ($version_number) = $Date::Manip::VERSION =~ /^(\d+\.\d+)/;
-      Date::Manip::Date_Init("TodayIsMidnight=1") if $version_number >= 5.43;
+      Date::Manip::Date_Init("TodayIsMidnight=1") if ($version_number >= 5.43 && $version_number < 6);
     }
   }
 


Index: grepmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/grepmail.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- grepmail.spec	6 Dec 2009 23:10:31 -0000	1.13
+++ grepmail.spec	15 Feb 2010 14:20:11 -0000	1.14
@@ -1,13 +1,14 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
 Version:	5.3034
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Applications/Text
 Url:		http://search.cpan.org/dist/grepmail/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DC/DCOPPIT/grepmail-%{version}.tar.gz
 Patch0:		grepmail-5.3034-revert-recursive-test-change.patch
 Patch1:		grepmail-5.3034-empty-file-not-error.patch
+Patch2:		grepmail-5.3034-date-manip-6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -39,6 +40,10 @@ operators.
 # http://code.google.com/p/grepmail/issues/detail?id=2
 %patch1 -p1
 
+# Fix incompatibilities with Date::Manip 6.x
+# http://rt.cpan.org/Public/Bug/Display.html?id=54621
+%patch2 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
 %{__make} %{?_smp_mflags}
@@ -48,7 +53,7 @@ operators.
 %{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
 /usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
 /usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
-%{__chmod} -R u+w %{buildroot}/*
+%{__chmod} -R u+w %{buildroot}
 
 %check
 export LANG=C
@@ -65,8 +70,11 @@ export TZ=GMT0
 %{_mandir}/man1/grepmail.1*
 
 %changelog
-* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 5.3034-2
-- rebuild against perl 5.10.1
+* Mon Feb 15 2010 Paul Howarth <paul at city-fan.org> 5.3034-3
+- Fix incompatibilities with Date::Manip 6.x (#564839, CPAN RT#54621)
+
+* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> 5.3034-2
+- Rebuild against perl 5.10.1
 
 * Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
 - Update to 5.3034