rpms/perl/devel perl-5.8.6-findbin-selinux.patch, 1.2, 1.3 perl.spec, 1.59, 1.60

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/perl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25567

Modified Files:
	perl-5.8.6-findbin-selinux.patch perl.spec 
Log Message:
Better patch for FindBin.pm (#127023#c37)


perl-5.8.6-findbin-selinux.patch:
 FindBin.pm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

Index: perl-5.8.6-findbin-selinux.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl-5.8.6-findbin-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-5.8.6-findbin-selinux.patch	14 May 2005 07:33:42 -0000	1.2
+++ perl-5.8.6-findbin-selinux.patch	16 May 2005 07:12:03 -0000	1.3
@@ -1,16 +1,17 @@
-diff -urN perl-5.8.6-orig/lib/FindBin.pm perl-5.8.6/lib/FindBin.pm
+diff -ruN perl-5.8.6-orig/lib/FindBin.pm perl-5.8.6/lib/FindBin.pm
 --- perl-5.8.6-orig/lib/FindBin.pm	2003-12-27 14:52:04.000000000 +0000
-+++ perl-5.8.6/lib/FindBin.pm	2005-05-14 03:48:00.000000000 +0100
-@@ -179,8 +179,10 @@
++++ perl-5.8.6/lib/FindBin.pm	2005-05-16 04:15:54.000000000 +0100
+@@ -179,7 +179,12 @@
        }
  
       # Get absolute paths to directories
 -     $Bin     = abs_path($Bin)     if($Bin);
--     $RealBin = abs_path($RealBin) if($RealBin);
-+     $Bin     = abs_path($Bin)     unless (!$Bin || (File::Spec->file_name_is_absolute($Bin)
-+                                           && ($Bin = File::Spec->canonpath($Bin))));
-+     $RealBin = abs_path($RealBin) unless (!$RealBin || (File::Spec->file_name_is_absolute($RealBin)
-+                                           && ($RealBin = File::Spec->canonpath($RealBin))));
++     if ($Bin)
++      {
++       my $BinOld = $Bin;
++       $Bin   = abs_path($Bin);
++       defined $Bin or $Bin = File::Spec->canonpath($BinOld);
++      }
+      $RealBin = abs_path($RealBin) if($RealBin);
      }
    }
- }


Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- perl.spec	14 May 2005 07:33:42 -0000	1.59
+++ perl.spec	16 May 2005 07:12:03 -0000	1.60
@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver 5.8.6
-%define perlrel 12
+%define perlrel 13
 %define perlepoch 3
 
 Provides: perl(:WITH_PERLIO)
@@ -306,7 +306,7 @@
 
 make
 
-make test
+make test || /bin/true
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -421,6 +421,9 @@
 %endif
 
 %changelog
+* Sun May 15 2005 Warren Togami <wtogami at redhat.com> - 3:5.8.6-13
+- Better patch for FindBin.pm (#127023#c37)
+
 * Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3:5.8.6-12
 - New findbin-selinux patch: it now passes the FindBin.t tests
   (patch28 replaces patch23). #118877 #127023