X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-perl-macros.patch;h=0744b9f822d54c69b333e55dc8e415519167b15d;hb=696c40ec8d02287260ad5947e8a0abd2799f4029;hp=33923595dc3faba95bc080cd774915a947e57814;hpb=fa78cfd4dc5685b48f32ab69aea5954a9e430a53;p=packages%2Frpm.git

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 3392359..0744b9f 100644
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,130 +1,48 @@
-diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac
---- rpm-4.3.org/configure.ac	2004-01-07 01:51:35.251160244 +0100
-+++ rpm-4.3/configure.ac	2004-01-07 01:55:53.198560246 +0100
-@@ -1313,6 +1313,7 @@
-     Doxyfile Makefile macros rpmpopt rpm.spec
-     rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
-     scripts/Makefile scripts/macros.perl scripts/macros.php
-+    scripts/perl.req scripts/perl.prov
-     scripts/macros.python tools/Makefile misc/Makefile doc/Makefile
-     doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
-     doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile
---- rpm-4.4.9/scripts/perl.req.orig	2006-07-08 16:13:50.000000000 +0200
-+++ rpm-4.4.9/scripts/perl.req	2008-03-24 01:13:31.985544655 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@__PERL@
- 
- # RPM (and its source code) is covered under two separate licenses. 
- 
-@@ -41,7 +41,11 @@
- 
- if ("@ARGV") {
-   foreach (@ARGV) {
--    process_file($_);
-+    if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
-+      if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
-+        process_file($_);
-+      }
-+    }
-   }
- } else {
-   
-@@ -49,7 +53,11 @@
-   # contents of the file.
-   
-   foreach (<>) {
--    process_file($_);
-+     if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
-+       if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
-+         process_file($_);
-+       }
-+     }
-   }
- }
- 
-@@ -203,19 +211,41 @@
- 
-       $module =~ s/\(\s*\)$//;
- 
--      if ( $module =~ m/^v?([0-9._]+)$/ ) {
-+      if ( $module =~ m/^(v?)([0-9._]+)$/ ) {
-       # if module is a number then both require and use interpret that
-       # to mean that a particular version of perl is specified
- 
--      my $ver=$1;
--      if ($ver =~ /5.00/) {
--        print "perl >= 0:$ver\n";
--        next;
--      }
--      else {
--        print "perl >= 1:$ver\n";
--        next;
--      }
-+	my $ver=$2;
-+	if (($1 eq 'v') or ($ver =~ /[0-9]+\.[0-9]+\.[0-9]+/)) {
-+	  # $V-style
-+	  if ($ver =~ m/5\.([0-5])(\.([0-9]+))?$/) {
-+	    if (defined $3) {
+--- rpm-4.5/scripts/perl.req	2008-07-09 12:38:31.000000000 +0300
++++ rpm-4.4.9/scripts/perl.req.in	2008-08-12 23:08:33.518675858 +0300
+@@ -277,20 +277,20 @@
+ 	  # $V-style
+ 	  if ($ver =~ m/5\.([0-5])(\.([0-9]+))?$/) {
+ 	    if (defined $3) {
+-	      print "perl >= 0:5.00$1_$3\n";
 +	      print "perl-base >= 0:5.00$1_$3\n";
-+	    } else {
+ 	    } else {
+-	      print "perl >= 0:5.00$1\n";
 +	      print "perl-base >= 0:5.00$1\n";
-+	    }
-+	  } else {
+ 	    }
+ 	  } else {
+-	    print "perl >= 1:$ver\n";
 +	    print "perl-base >= 1:$ver\n";
-+	  }
-+	} else {
-+	  # $]-style
-+	  if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) {
-+	    if (defined $2) {
+ 	  }
+ 	} else {
+ 	  # $]-style
+ 	  if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) {
+ 	    if (defined $2) {
+-	      print "perl >= 0:5.$1_$2\n";
 +	      print "perl-base >= 0:5.$1_$2\n";
-+	    } else {
+ 	    } else {
+-	      print "perl >= 0:5.$1\n";
 +	      print "perl-base >= 0:5.$1\n";
-+	    }
-+	  } else {
-+	    # expand to M.NNN_nnn form
-+	    $ver =~ s/^([0-9])$/$1./;
-+	    $ver =~ s/^([0-9]\.[0-9]{0,5}|[0-9]\.[0-9]{3}_[0-9]{0,2})$/${1}000000/;
-+	    $ver =~ s/^([0-9]\.[0-9]{3})_?([0-9]{3})0*$/$1_$2/;
-+	    # match trimming leading 0s
-+	    $ver =~ m/^([0-9])\.0*([1-9][0-9]*|0)_0*([1-9][0-9]*|0)$/;
+ 	    }
+ 	  } else {
+ 	    # expand to M.NNN_nnn form
+@@ -299,7 +299,7 @@
+ 	    $ver =~ s/^([0-9]\.[0-9]{3})_?([0-9]{3})0*$/$1_$2/;
+ 	    # match trimming leading 0s
+ 	    $ver =~ m/^([0-9])\.0*([1-9][0-9]*|0)_0*([1-9][0-9]*|0)$/;
+-	    print "perl >= 1:$1.$2.$3\n";
 +	    print "perl-base >= 1:$1.$2.$3\n";
-+	  }
-+	}
-+	next;
- 
-       };
+ 	  }
+ 	}
+ 	next;
+@@ -326,6 +326,10 @@
  
-@@ -232,7 +262,31 @@
-       # will be included with the name sys/systeminfo.ph so only use the
-       # basename of *.ph files
+       ($module =~ m/\.(ph|pl|t)$/) && next;
  
--      ($module  =~ m/\.ph$/) && next;
-+      # ($module  =~ m/\.ph$/) && ($module =~ s!.*/!!g );
-+ 
-+      # there is no need to generate dependencies for ph, pl or test files
-+      # so let's just skip them.
-+
-+      ($module =~ m/\.(ph|pl|t)$/) && next;
-+
 +      # skip all modules for platforms other than linux.
 +
 +      ($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 =~ s/\.pm$//;
-+
-+      $module =~ s/\//::/;
-+
-+      # trim off trailing parenthesis if any.  Sometimes people pass
-+      # the module an empty list.
-+
-+      $module =~ s/\(\s*\)$//;
+       # if the module name starts in a dot it is not a module name.
  
-       $require{$module}=$version;
-       $line{$module}=$_;
+       ($module =~ m/^\./) && next;