X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-perl-req-perlfile.patch;h=5fe81f943d0387afcdfdde5a50fa899c9df02d94;hb=b3f4b67879a119ac321ecb558299d287279986b4;hp=e5579a069784c4ddde60df9213ac183a3e4f56ac;hpb=5b0f0ac9a55211821b0778001221c01854a2e4d2;p=packages%2Frpm.git diff --git a/rpm-perl-req-perlfile.patch b/rpm-perl-req-perlfile.patch index e5579a0..5fe81f9 100644 --- a/rpm-perl-req-perlfile.patch +++ b/rpm-perl-req-perlfile.patch @@ -1,7 +1,32 @@ ---- rpm-4.0.4/scripts/perl.req.wiget Tue Feb 12 21:49:36 2002 -+++ rpm-4.0.4/scripts/perl.req Tue Feb 12 21:51:41 2002 -@@ -61,6 +61,11 @@ - } +--- rpm-4.2/scripts/perl.req.wigperl Tue Apr 1 13:33:52 2003 ++++ rpm-4.2/scripts/perl.req Tue Apr 1 13:39:47 2003 +@@ -39,28 +39,20 @@ + + # by Ken Estes Mail.com kestes@staff.mail.com + +-if ("@ARGV") { +- foreach (@ARGV) { ++foreach ( @ARGV ? @ARGV : <> ) { ++ chomp; + if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { + if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { +- process_file($_); ++ process_file($_) if -f; + } + } +- } +-} else { +- +- # notice we are passed a list of filenames NOT as common in unix the +- # contents of the file. +- +- foreach (<>) { +- if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) { +- if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) { +- process_file($_); +- } +- } +- } } +foreach (sort keys %provide) { @@ -12,7 +37,7 @@ foreach $module (sort keys %require) { if (length($require{$module}) == 0) { -@@ -82,6 +87,53 @@ +@@ -82,6 +74,53 @@ exit 0; @@ -66,7 +91,7 @@ sub process_file { -@@ -90,6 +142,8 @@ +@@ -90,6 +129,8 @@ open(FILE, "<$file") || return; @@ -75,7 +100,7 @@ while () { # skip the documentation -@@ -111,6 +165,10 @@ +@@ -111,6 +152,10 @@ last; } @@ -86,7 +111,7 @@ # Each keyword can appear multiple times. Don't # bother with datastructures to store these strings, # if we need to print it print it now. -@@ -229,6 +287,10 @@ +@@ -236,6 +281,10 @@ ($module =~ m/^\./) && next;