- merged 4.1 patches... hope I didn't brake anything

[packages/rpm.git] / rpm-perl-req-perlfile.patch

diff --git a/rpm-perl-req-perlfile.patch b/rpm-perl-req-perlfile.patch
index 93a395032324456dabf7a60e600a6e75d1dcda4c..e5579a069784c4ddde60df9213ac183a3e4f56ac 100644 (file)
--- a/rpm-perl-req-perlfile.patch
+++ b/rpm-perl-req-perlfile.patch
@@ -1,5 +1,5 @@
---- rpm-4.0/scripts/perl.req   Mon Dec 16 11:36:15 2000
-+++ rpm-4.0.mis/scripts/perl.req       Mon Dec 16 11:46:28 2000
+--- 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 @@
    }
  }
@@ -12,7 +12,7 @@
  
  foreach $module (sort keys %require) {
    if (length($require{$module}) == 0) {
-@@ -82,6 +86,53 @@
+@@ -82,6 +87,53 @@
  exit 0;
  
  
@@ -66,16 +66,16 @@
  
  sub process_file {
    
-@@ -90,6 +141,8 @@
+@@ -90,6 +142,8 @@
    
-   open(FILE, "<$file")||
-     die("$0: Could not open file: '$file' : $!\n");
-+
-+  return if (!is_perlfile($file, \*FILE));
+   open(FILE, "<$file") || return;
    
++  return if (!is_perlfile($file, \*FILE));
++
    while (<FILE>) {
      
-@@ -112,6 +165,10 @@
+     # skip the documentation
+@@ -111,6 +165,10 @@
        last;
      }
  
@@ -86,14 +86,14 @@
      # Each keyword can appear multiple times.  Don't
      #  bother with datastructures to store these strings,
      #  if we need to print it print it now.
-@@ -209,6 +266,10 @@
-       # if the module name starts in a dot it is not a module name.
+@@ -229,6 +287,10 @@
  
        ($module =~ m/^\./) && next;
-+
+ 
 +      # name starts in a non alphanumeric character it is not a module 
 +      # name.
 +      ($module =~ m/^\W/) && next;
- 
++
        # if the module ends with .pm strip it to leave only basename.
  
+       $module =~ s/\.pm$//;