rpms/perl-Net-IP/devel IP.pm.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-Net-IP.spec, 1.2, 1.3 sources, 1.2, 1.3

[Ville Skytta (scop)]

Changeset from: scop

Update of /cvs/extras/rpms/perl-Net-IP/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18746

Modified Files:
	.cvsignore perl-Net-IP.spec sources 
Added Files:
	IP.pm.patch 
Log Message:
Sync with fedora.us 1.21-0.fdr.1.

IP.pm.patch:

--- NEW FILE IP.pm.patch ---
cd c:\Perl\site\lib\Net\
diff -u IP.pm.orig IP.pm
Compilation started at Thu Nov 04 22:38:54 2004 +0100 (W. Europe Standard Time)
--- IP.pm.orig	2003-04-09 14:42:25.000000000 +0200
+++ IP.pm	2004-11-04 22:38:46.000000000 +0100
@@ -1533,10 +1533,8 @@
 	while (ip_bincomp ($binip,'le',$endbinip) == 1)
 	{
 		# Find all 0s at the end
-		$binip =~ m/(0+)$/;
-		# nbits = nb of 0 bits
-		
-		if ($1) {
+		if ($binip =~ m/(0+)$/) {
+			# nbits = nb of 0 bits
 			$nbits = length ($1);
 		}
 		else {

Compilation exited abnormally with code 1 at Thu Nov 04 22:38:54


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:05:38 -0000	1.2
+++ .cvsignore	6 Dec 2004 08:17:41 -0000	1.3
@@ -1 +1 @@
-Net-IP-1.20.tar.gz
+Net-IP-1.21.tar.gz


Index: perl-Net-IP.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/perl-Net-IP.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Net-IP.spec	8 Nov 2004 05:05:44 -0000	1.2
+++ perl-Net-IP.spec	6 Dec 2004 08:17:41 -0000	1.3
@@ -1,19 +1,20 @@
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 Name:           perl-Net-IP
-Version:        1.20
-Release:        0.fdr.6.1.92
+Version:        1.21
+Release:        1
 Epoch:          0
 Summary:        Perl module for manipulation of IPv4 and IPv6 addresses
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Net-IP/
-Source:         http://www.cpan.org/modules/by-module/Net/Net-IP-1.20.tar.gz
+Source:         http://www.cpan.org/modules/by-module/Net/Net-IP-1.21.tar.gz
+Patch0:         http://rt.cpan.org/NoAuth/Attachment/24678/24151/IP.pm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1-34.99.6
+BuildRequires:  perl >= 1:5.6.1
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -27,18 +28,21 @@
 
 %prep
 %setup -q -n Net-IP-%{version}
+# http://rt.cpan.org/NoAuth/Bug.html?id=7528
+%patch0 -p0
+# http://rt.cpan.org/NoAuth/Bug.html?id=3844
+%{__perl} -pi -e 's/^use 5\.008;$//' Makefile.PL # 
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
@@ -61,6 +65,13 @@
 
 
 %changelog
+* Thu Dec  2 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.21-1
+- Update to 1.21.
+
+* Sat Nov  6 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.20-0.fdr.7
+- Apply fixes from rt.cpan.org #3844 and #7528.
+- Some specfile cleanups.
+
 * Sun May  9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.20-0.fdr.6
 - BuildRequire perl >= 1:5.6.1-34.99.6 for support for vendor installdirs.
 - Use pure_install to avoid perllocal.pod workarounds.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-IP/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:05:38 -0000	1.2
+++ sources	6 Dec 2004 08:17:41 -0000	1.3
@@ -1 +1 @@
-73c5941562833d5ca7ca7c3bff7983fe  Net-IP-1.20.tar.gz
+1a4163b626a743ca5a76e04cc00fa73d  Net-IP-1.21.tar.gz