From 222e18e007c7b3624fbc4680f16a96ba301292cf Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Mon, 3 Dec 2007 12:34:20 +0000
Subject: [PATCH] - Update to 2.02 - Remove buildreqs perl(Net::SMTP) and
perl(Net::Domain), bundled with perl - Add buildreqs perl(Date::Format),
perl(Date::Parse), perl(Test::More), and perl(Test::Pod) - Remove patch
for CPAN RT#20726, now fixed upstream - Buildreq perl >= 5.8.1 - Tweak files
list to mark pod files as %doc - Fix character encoding for ChangeLog
---
.cvsignore | 2 +-
perl-MailTools-1.74-CPAN-20726.patch | 20 --------------
perl-MailTools.spec | 39 ++++++++++++++++++----------
sources | 2 +-
4 files changed, 28 insertions(+), 35 deletions(-)
delete mode 100644 perl-MailTools-1.74-CPAN-20726.patch
diff --git a/.cvsignore b/.cvsignore
index b02d8aa..19a8651 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-MailTools-1.77.tar.gz
+MailTools-2.02.tar.gz
diff --git a/perl-MailTools-1.74-CPAN-20726.patch b/perl-MailTools-1.74-CPAN-20726.patch
deleted file mode 100644
index 4012ebc..0000000
--- a/perl-MailTools-1.74-CPAN-20726.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Mail/Util.pm.orig 2006-01-21 03:16:10.000000000 -0600
-+++ Mail/Util.pm 2006-07-27 14:10:14.000000000 -0500
-@@ -13,7 +13,7 @@
- use Exporter ();
-
- BEGIN {
-- require 5.000;
-+ require 5.006_001;
-
- $VERSION = "1.74";
-
-@@ -102,7 +102,7 @@
- local *FH;
- local $_;
-
-- open(FH,"< $file") or
-+ open(FH,'<',$file) or
- do {
- require Carp;
- Carp::croak("cannot open '$file': $!\n");
diff --git a/perl-MailTools.spec b/perl-MailTools.spec
index 1e88d31..24811d7 100644
--- a/perl-MailTools.spec
+++ b/perl-MailTools.spec
@@ -1,16 +1,16 @@
Summary: Various mail-related perl modules
Name: perl-MailTools
-Version: 1.77
-Release: 2%{?dist}
+Version: 2.02
+Release: 1%{?dist}
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/MailTools/
Source0: http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-%{version}.tar.gz
-Patch0: perl-MailTools-1.74-CPAN-20726.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl(ExtUtils::MakeMaker), perl(Net::Domain), perl(Net::SMTP)
+BuildRequires: perl(Date::Format), perl(Date::Parse), perl(ExtUtils::MakeMaker)
+BuildRequires: perl(Test::More), perl(Test::Pod), perl >= 3:5.8.1
%description
MailTools is a set of Perl modules related to mail applications.
@@ -18,13 +18,6 @@ MailTools is a set of Perl modules related to mail applications.
%prep
%setup -q -n MailTools-%{version}
-# This patch addresses CPAN RT#20726 (http://rt.cpan.org/Public/Bug/Display.html?id=20726)
-# which is about handling filenames with trailing spaces. This patch has been rejected
-# upstream because it raises the minimum perl version required to 5.6.1, which upstream
-# considers to be "too recent". However, given that all distributions supported by this
-# package have at least perl 5.8.0, it's not a problem for us.
-%patch0 -p0
-
# Set up example scripts
cd examples
for file in *.PL; do
@@ -36,6 +29,10 @@ done
%{__rm} *.PL
cd -
+# Fix character encodings
+/usr/bin/iconv -f iso-8859-1 -t utf8 < ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
@@ -56,11 +53,27 @@ cd -
%files
%defattr(-,root,root,-)
%doc ChangeLog README* examples/
-%{perl_vendorlib}/auto/Mail/
-%{perl_vendorlib}/Mail/
+%dir %{perl_vendorlib}/Mail/
+%doc %{perl_vendorlib}/Mail/*.pod
+%{perl_vendorlib}/Mail/*.pm
+%dir %{perl_vendorlib}/Mail/Field/
+%doc %{perl_vendorlib}/Mail/Field/*.pod
+%{perl_vendorlib}/Mail/Field/*.pm
+%dir %{perl_vendorlib}/Mail/Mailer/
+%{perl_vendorlib}/Mail/Mailer/*.pm
%{_mandir}/man3/Mail::*.3pm*
%changelog
+* Mon Dec 3 2007 Paul Howarth <paul@city-fan.org> 2.02-1
+- Update to 2.02
+- Remove buildreqs perl(Net::SMTP) and perl(Net::Domain), bundled with perl
+- Add buildreqs perl(Date::Format), perl(Date::Parse), perl(Test::More), and
+ perl(Test::Pod)
+- Remove patch for CPAN RT#20726, now fixed upstream
+- Buildreq perl >= 5.8.1
+- Tweak files list to mark pod files as %%doc
+- Fix character encoding for ChangeLog
+
* Mon Aug 13 2007 Paul Howarth <paul@city-fan.org> 1.77-2
- Clarify license as GPL v1 or later, or Artistic (same as perl)
- Unexpand tabs in spec file
diff --git a/sources b/sources
index 8df2b90..0ba7bcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1bcd6627cb9bab271b77a8323d62c48 MailTools-1.77.tar.gz
+824bdbe6c4084739ac2d005eebb09b0e MailTools-2.02.tar.gz