- more fixes in perl.req

Changed files:
    rpm-perl-macros.patch -> 1.12
    rpm.spec -> 1.68

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 7f034e241ad845d1409154a587a638b6e450757e..e3bd72191719487873ce2e88ae0ebbda8b8f764d 100644 (file)
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -157,7 +157,7 @@
        next;
      }
  
-@@ -108,8 +120,20 @@
+@@ -108,8 +120,24 @@
        # will be included with the name sys/systeminfo.ph so only use the
        # basename of *.ph files
  
@@ -174,8 +174,12 @@
 +      ($module =~ m/Mac|OS2|MSDOS|Win32|VMS|vmsish/) && 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}=$_;

diff --git a/rpm.spec b/rpm.spec
index 23b5556e14a28fc0afbf80f0ad5286f78594900e..310cf5c5191b1f469cd36ad5080fb47aecb4a67c 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary:        Red Hat & PLD Package Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       3.0.3
-Release:       15
+Release:       16
 Group:         Base
 Group(pl):     Podstawowe
 Copyright:     GPL