rpms/cpan2rpm/F-9 cpan2rpm-Pod-PlainText.patch, NONE, 1.1 cpan2rpm-2.024-nonetwork.patch, 1.1, 1.2 cpan2rpm.spec, 1.7, 1.8

Štěpán Kasal kasal at fedoraproject.org
Mon Mar 30 14:09:35 UTC 2009


Author: kasal

Update of /cvs/extras/rpms/cpan2rpm/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5131

Modified Files:
	cpan2rpm-2.024-nonetwork.patch cpan2rpm.spec 
Added Files:
	cpan2rpm-Pod-PlainText.patch 
Log Message:
sync with rawhide

cpan2rpm-Pod-PlainText.patch:

--- NEW FILE cpan2rpm-Pod-PlainText.patch ---
--- cpan2rpm	2005-06-18 00:06:54.000000000 -0500
+++ cpan2rpm.fix	2007-05-30 15:27:55.000000000 -0500
@@ -28,7 +28,7 @@
 use warnings;
 use Getopt::Long;
 use Sys::Hostname;
-use Pod::Text;
+use Pod::PlainText;
 
 my ($ME, $RPM, $TMPDIR, %RPMDIR, $CWD, %info, %meta, $ARGS);
 
@@ -359,7 +359,7 @@
 
 sub get_meta {
     my $info = shift || $_; local $_;
-    my $pod = Pod::Text->new();
+    my $pod = Pod::PlainText->new();
 
     print "Metadata retrieval\n";
 

cpan2rpm-2.024-nonetwork.patch:

Index: cpan2rpm-2.024-nonetwork.patch
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/F-9/cpan2rpm-2.024-nonetwork.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpan2rpm-2.024-nonetwork.patch	8 Nov 2004 04:10:43 -0000	1.1
+++ cpan2rpm-2.024-nonetwork.patch	30 Mar 2009 14:09:34 -0000	1.2
@@ -2,7 +2,7 @@
 +++ BUILD/cpan2rpm-2.024/cpan2rpm.spec.PL	2004-03-15 22:58:15.486225403 +0100
 @@ -8,20 +8,3 @@
      , qq(ver=`rpm -q rpm --qf %%{version}|awk -F . '{print \$1}'`)
-     , qq([ \$ver -le 3 -o -s \$SuSE ] && echo rpm || echo rpm-build)
+     , qq([ \$ver -le 3 -o -n "\$SuSE" ] && echo rpm || echo rpm-build)
      ;
 -
 -my @cmd = (


Index: cpan2rpm.spec
===================================================================
RCS file: /cvs/extras/rpms/cpan2rpm/F-9/cpan2rpm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cpan2rpm.spec	15 Oct 2007 14:31:07 -0000	1.7
+++ cpan2rpm.spec	30 Mar 2009 14:09:34 -0000	1.8
@@ -1,15 +1,17 @@
 Name:           cpan2rpm
 Version:        2.028
-Release:        2%{?dist}.1
+Release:        6%{?dist}
 
 Summary:        Perl module packager
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://search.cpan.org/~ecalder/cpan2rpm/
-Source0:        http://search.cpan.org/CPAN/authors/id/E/EC/ECALDER/cpan2rpm-2.028.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/E/EC/ECALDER/%{name}-%{version}.tar.gz
 Patch0:         cpan2rpm-2.024-nonetwork.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+# fixes #481147, aka http://rt.cpan.org/Public/Bug/Display.html?id=27309
+Patch1:         cpan2rpm-Pod-PlainText.patch
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
 BuildRequires:  perl
@@ -27,7 +29,8 @@
 
 %prep
 %setup -q
-%patch -p2 -b .orig
+%patch0 -p2 -b .nonetwork
+%patch1 -p0 -b .pod-plaintext
 
 
 %build
@@ -58,6 +61,18 @@
 
 
 %changelog
+* Mon Mar 30 2009 Stepan Kasal <skasal at redhat.com> - 2.028-6
+- Use Pod::PlainText instead of Pod::Text (#481147)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.028-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 12 2009 Stepan Kasal <skasal at redhat.com> - 2.028-4
+- ... and fix patch0 so that it applies with no fuzz.
+
+* Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.028-3
+- Fix Patch0:/%%patch mismatch.
+
 * Mon Oct 15 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 2.028-2.1
 - correct license tag
 - add BR: perl(ExtUtils::MakeMaker)




More information about the Fedora-perl-devel-list mailing list