rpms/grepmail/devel grepmail-5.3034-empty-file-not-error.patch, NONE, 1.1 grepmail-5.3034-revert-recursive-test-change.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 grepmail.spec, 1.11, 1.12 sources, 1.3, 1.4

Paul Howarth pghmcfc at fedoraproject.org
Wed Sep 2 13:46:36 UTC 2009


Author: pghmcfc

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

Modified Files:
	.cvsignore grepmail.spec sources 
Added Files:
	grepmail-5.3034-empty-file-not-error.patch 
	grepmail-5.3034-revert-recursive-test-change.patch 
Log Message:
* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
- Update to 5.3034
  - fix man page year typo (Debian bug #428973)
  - updated to the latest version of Module::Install
  - added TODO to the distribution
  - fix a bug where grepmail could abort with -L
  - fix a bug in the -R test that could cause a false test failure
  - fix uninitialized variable warnings for emails missing certain headers
- URLs moved back to search.cpan.org
- Buildreq perl(Test::More)
- Buildreq perl(Module::AutoInstall), should have been bundled
- Revert change to t/recursive.t from 5.3033 that causes test failure
- Patch t/nonexistent_mailbox.t to support changed behaviour of
  Mail::Mbox::MessageParser >= 1.5002


grepmail-5.3034-empty-file-not-error.patch:
 nonexistent_mailbox.t |    9 +++++++++
 1 file changed, 9 insertions(+)

--- NEW FILE grepmail-5.3034-empty-file-not-error.patch ---
--- grepmail-5.3034/t/nonexistent_mailbox.t	2009-09-02 11:51:28.000000000 +0100
+++ grepmail-5.3034/t/nonexistent_mailbox.t	2009-09-02 13:37:09.000000000 +0100
@@ -149,6 +149,15 @@
 
   my %skip;
 
+  $skip{"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+        " | grepmail pattern"} = 'inappropriate for Mail::Mbox::MessageParser >= 1.5002'
+        if $Mail::Mbox::MessageParser::VERSION >= 1.5002;
+
+  $skip{"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+        " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"} =
+        'inappropriate for Mail::Mbox::MessageParser >= 1.5002'
+        if $Mail::Mbox::MessageParser::VERSION >= 1.5002;
+
   return %skip;
 }
 

grepmail-5.3034-revert-recursive-test-change.patch:
 recursive.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE grepmail-5.3034-revert-recursive-test-change.patch ---
--- grepmail-5.3034/t/recursive.t	2009-08-16 21:25:17.000000000 +0100
+++ grepmail-5.3034/t/recursive.t	2009-09-02 11:24:03.000000000 +0100
@@ -17,7 +17,7 @@
 'grepmail -Lq Handy t/temp/directory_with_links'
   => ['recursive2','none'],
 'grepmail -Rq Handy t/temp/directory_with_links'
-  => ['recursive2','none'],
+  => ['recursive','none'],
 );
 
 my %expected_errors = (


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	2 Mar 2007 14:01:37 -0000	1.3
+++ .cvsignore	2 Sep 2009 13:46:35 -0000	1.4
@@ -1 +1 @@
-grepmail-5.3033.tar.gz
+grepmail-5.3034.tar.gz


Index: grepmail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/grepmail.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- grepmail.spec	25 Jul 2009 01:25:55 -0000	1.11
+++ grepmail.spec	2 Sep 2009 13:46:36 -0000	1.12
@@ -1,17 +1,22 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
-Version:	5.3033
-Release:	6%{?dist}
+Version:	5.3034
+Release:	1%{?dist}
 License:	GPL+
 Group:		Applications/Text
-Url:		http://grepmail.sourceforge.net/
-Source0:	http://downloads.sf.net/grepmail/grepmail-%{version}.tar.gz
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
 BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001, perl(Date::Parse), perl(Date::Manip)
-BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(ExtUtils::MakeMaker), perl(Test::More)
+# AutoInstall.pm should have been bundled but wasn't
+# http://code.google.com/p/grepmail/issues/detail?id=1
+BuildRequires:	perl(Module::AutoInstall)
 # The following module requirements are optional and hence not picked up by RPM automatically.
 # Adding manual deps for them improves grepmail's functionality.
 Requires:	perl(Date::Parse), perl(Date::Manip)
@@ -26,6 +31,14 @@ operators.
 %prep
 %setup -q -n %{name}-%{version}
 
+# Revert recursive test change in 5.3034 that breaks test suite
+# http://code.google.com/p/grepmail/issues/detail?id=2
+%patch0 -p1
+
+# Empty files are not treated as errors by Mail::Mbox::MessageParser >= 1.5002
+# http://code.google.com/p/grepmail/issues/detail?id=2
+%patch1 -p1
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor --default
 %{__make} %{?_smp_mflags}
@@ -34,7 +47,7 @@ operators.
 %{__rm} -rf %{buildroot}
 %{__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 ';'
+/usr/bin/find %{buildroot} -depth -type d -exec /bin/rmdir {} ';' 2>/dev/null
 %{__chmod} -R u+w %{buildroot}/*
 
 %check
@@ -47,19 +60,34 @@ export TZ=GMT0
 
 %files
 %defattr(-,root,root,-)
-%doc README* CHANGES LICENSE
+%doc README* CHANGES LICENSE TODO
 %{_bindir}/grepmail
 %{_mandir}/man1/grepmail.1*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3033-6
+* Wed Sep  2 2009 Paul Howarth <paul at city-fan.org> 5.3034-1
+- Update to 5.3034
+  - fix man page year typo (Debian bug #428973)
+  - updated to the latest version of Module::Install
+  - added TODO to the distribution
+  - fix a bug where grepmail could abort with -L
+  - fix a bug in the -R test that could cause a false test failure
+  - fix uninitialized variable warnings for emails missing certain headers
+- URLs moved back to search.cpan.org
+- Buildreq perl(Test::More)
+- Buildreq perl(Module::AutoInstall), should have been bundled
+- Revert change to t/recursive.t from 5.3033 that causes test failure
+- Patch t/nonexistent_mailbox.t to support changed behaviour of
+  Mail::Mbox::MessageParser >= 1.5002
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 5.3033-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3033-5
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 5.3033-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Thu Feb  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> 5.3033-4
-- rebuild for new perl
+- Rebuild for new perl
 
 * Wed Apr 18 2007 Paul Howarth <paul at city-fan.org> 5.3033-3
 - Buildrequire perl(ExtUtils::MakeMaker) instead of perl-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/grepmail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Mar 2007 14:01:37 -0000	1.3
+++ sources	2 Sep 2009 13:46:36 -0000	1.4
@@ -1 +1 @@
-83f94e253ccb02fde9a207d7f23c9cd2  grepmail-5.3033.tar.gz
+1785cc317fab38bc8386b44c543ae6d1  grepmail-5.3034.tar.gz




More information about the fedora-extras-commits mailing list