- small fixes in perl.prov

[packages/rpm.git] / rpm-perl-macros.patch

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 7f034e241ad845d1409154a587a638b6e450757e..dfaa50e6d203cd76a31152eadfa761d607e6d1c2 100644 (file)
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -157,7 +157,7 @@
        next;
      }
  
-@@ -108,8 +120,20 @@
+@@ -108,8 +120,28 @@
        # will be included with the name sys/systeminfo.ph so only use the
        # basename of *.ph files
  
@@ -173,9 +173,17 @@
 +
 +      ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && next;
 +
++      # if the module name starts in a dot it is not a module name
++
++      ($module =~ m/^\./) && next;
++
 +      # if the module ends with .pm strip it to leave only basename
++
++      ($module =~ m/\.pm$/) && ($module =~ s/\.pm//g);
++
++      # strip () from module name ( ex. Carp() )
 
-+      ($module =~ m/\.pm$/) && ($module =~ s!\.pm$!!g );
++      ($module =~m/\(\)$/) && ($module =~ s/\(\)//g);
  
        $require{$module}=$version;
        $line{$module}=$_;
@@ -192,7 +200,7 @@
  if ("@ARGV") {
    foreach (@ARGV) {
 -    process_file($_);
-+    if (! m=\.(so|gz|ph|pod)$=) {
++     if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod)$)=) {
 +      process_file($_);
 +    }
    }
@@ -203,7 +211,7 @@
  
    foreach (<>) {
 -    process_file($_);
-+    if (! m=\.(so|gz|ph|pod)$=) {
++     if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod)$)=) {
 +      process_file($_);
 +    }
    }