pghmcfc pushed to grepmail (grepmail-5.3100-1.fc23). "Update to 5.3100 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Mar 25 11:17:22 UTC 2015


>From 84954025bdcdbeee37030d0b3e4025e6f7c7f559 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Wed, 25 Mar 2015 11:05:31 +0000
Subject: Update to 5.3100

- New upstream release 5.3100
  - Move code to github
  - Fixed a bug where complex -E search patterns containing '\/' would fail to
    match emails properly (http://bugs.debian.org/432083)
  - Add POD test
  - Update tests to use Config{perlpath} for better compatibility with
    automated testing
  - Prevent MakeMaker from recursing into any "old" directory
  - Fix t/invalid_date.t to work even when Date::Manip is not installed
  - Fix t/nonexistent_mailbox.t - broken STDIN does not cause $SIG{PIPE}
  - Added lzip support (http://sourceforge.net/p/grepmail/patches/8/)
  - Added xz support
  - Fix incompatibility with newer versions of Date::Manip (CPAN RT#54621)
- Classify buildreqs by usage
- Drop %defattr, redundant since rpm 4.4
- Use %license where possible
- Use DESTDIR rather than PERL_INSTALL_ROOT
- Use %{_fixperms} macro rather than our own chmod incantation
- Don't need to run test suite with LANG=C
- Don't need to remove empty directories from the buildroot

diff --git a/.gitignore b/.gitignore
index 9657483..914abd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-grepmail-5.3034.tar.gz
+/grepmail-[0-9.]*.tar.gz
diff --git a/grepmail-5.3034-date-manip-6.patch b/grepmail-5.3034-date-manip-6.patch
deleted file mode 100644
index cd3d919..0000000
--- a/grepmail-5.3034-date-manip-6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
-     }
-   }
- 
diff --git a/grepmail-5.3034-empty-file-not-error.patch b/grepmail-5.3034-empty-file-not-error.patch
deleted file mode 100644
index 73ecca2..0000000
--- a/grepmail-5.3034-empty-file-not-error.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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;
- }
- 
diff --git a/grepmail.spec b/grepmail.spec
index 2fe9366..61b6efa 100644
--- a/grepmail.spec
+++ b/grepmail.spec
@@ -1,34 +1,67 @@
 Summary:	Search mailboxes for a particular email
 Name:		grepmail
-Version:	5.3034
-Release:	15%{?dist}
+Version:	5.3100
+Release:	1%{?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 -nu)
 BuildArch:	noarch
+# Module Build
+BuildRequires:	perl
+BuildRequires:	perl(base)
+BuildRequires:	perl(Config)
+BuildRequires:	perl(constant)
+BuildRequires:	perl(Cwd)
+BuildRequires:	perl(Errno)
+BuildRequires:	perl(Exporter)
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(ExtUtils::Manifest)
+BuildRequires:	perl(Fcntl) >= 1.03
+BuildRequires:	perl(File::Path)
+BuildRequires:	perl(File::Spec) >= 0.8
+BuildRequires:	perl(FindBin)
+BuildRequires:	perl(IO::Handle)
+BuildRequires:	perl(IO::Seekable)
+BuildRequires:	perl(List::Util)
+BuildRequires:	perl(overload)
+BuildRequires:	perl(POSIX)
+BuildRequires:	perl(Symbol)
+# AutoInstall.pm should have been bundled but wasn't
+# http://code.google.com/p/grepmail/issues/detail?id=1
+# https://github.com/coppit/grepmail/issues/1
+BuildRequires:	perl(Module::AutoInstall)
+# Module Runtime
 BuildRequires:	perl(Carp)
+BuildRequires:	perl(Getopt::Std)
+BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001
+BuildRequires:	perl(strict)
+BuildRequires:	perl(vars)
+# Optional Functionality
 BuildRequires:	perl(Date::Manip)
 BuildRequires:	perl(Date::Parse)
 BuildRequires:	perl(Digest::MD5)
-BuildRequires:	perl(ExtUtils::MakeMaker)
-BuildRequires:	perl(Mail::Mbox::MessageParser) >= 1.4001
+BuildRequires:	perl(File::Find)
+BuildRequires:	perl(Time::Local)
+# Test Suite
+BuildRequires:	perl(ExtUtils::Command)
+BuildRequires:	perl(File::Copy)
+BuildRequires:	perl(File::Spec::Functions)
+BuildRequires:	perl(FileHandle)
+BuildRequires:	perl(lib)
 BuildRequires:	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)
+# Optional Tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+# Runtime
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
-Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
-# 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::Manip)
 Requires:	perl(Date::Parse)
 Requires:	perl(Digest::MD5)
-# perl(Date::Parse) can be found in the perl-TimeDate package
+Requires:	perl(File::Find)
+Requires:	perl(Mail::Mbox::MessageParser) >= 1.4001
+Requires:	perl(Time::Local)
 
 %description
 Grepmail searches a normal or compressed mailbox for a given regular
@@ -41,29 +74,20 @@ operators.
 
 # Revert recursive test change in 5.3034 that breaks test suite
 # http://code.google.com/p/grepmail/issues/detail?id=2
+# https://github.com/coppit/grepmail/issues/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
-
-# 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
+perl Makefile.PL INSTALLDIRS=vendor --skipdeps
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
-chmod -R u+w %{buildroot}
+%{_fixperms} %{buildroot}
 
 %check
-export LANG=C
 export TZ=GMT0
 make test
 
@@ -71,12 +95,38 @@ make test
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc README* CHANGES LICENSE TODO
+%if 0%{?_licensedir:1}
+%license LICENSE
+%else
+%doc LICENSE
+%endif
+%doc CHANGES README TODO
 %{_bindir}/grepmail
 %{_mandir}/man1/grepmail.1*
 
 %changelog
+* Wed Mar 25 2015 Paul Howarth <paul at city-fan.org> - 5.3100-1
+- Update to 5.3100
+  - Move code to github
+  - Fixed a bug where complex -E search patterns containing '\/' would fail to
+    match emails properly (http://bugs.debian.org/432083)
+  - Add POD test
+  - Update tests to use Config{perlpath} for better compatibility with
+    automated testing
+  - Prevent MakeMaker from recursing into any "old" directory
+  - Fix t/invalid_date.t to work even when Date::Manip is not installed
+  - Fix t/nonexistent_mailbox.t - broken STDIN does not cause $SIG{PIPE}
+  - Added lzip support (http://sourceforge.net/p/grepmail/patches/8/)
+  - Added xz support
+  - Fix incompatibility with newer versions of Date::Manip (CPAN RT#54621)
+- Classify buildreqs by usage
+- Drop %%defattr, redundant since rpm 4.4
+- Use %%license where possible
+- Use DESTDIR rather than PERL_INSTALL_ROOT
+- Use %%{_fixperms} macro rather than our own chmod incantation
+- Don't need to run test suite with LANG=C
+- Don't need to remove empty directories from the buildroot
+
 * Thu Aug 28 2014 Jitka Plesnikova <jplesnik at redhat.com> - 5.3034-15
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index 4b1a446..2980960 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1785cc317fab38bc8386b44c543ae6d1  grepmail-5.3034.tar.gz
+0fba744db3c7485fc2a13ef22a95dbaf  grepmail-5.3100.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/grepmail.git/commit/?h=grepmail-5.3100-1.fc23&id=84954025bdcdbeee37030d0b3e4025e6f7c7f559

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390


More information about the scm-commits mailing list