X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-perl-macros.patch;h=1d09638388873b813cebea16cf0c88c90b1798ad;hb=f16801b5b5703449949812336f5d8140985326e4;hp=8fbf13ac12fc1720e60b6af95e413623ed318e3e;hpb=9884a1b5d72615048c4e85b4ae8f73a2f0ee3c1e;p=packages%2Frpm.git

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 8fbf13a..1d09638 100644
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,55 +1,17 @@
---- rpm-4.0.2/scripts/Makefile.am.wiget	Tue Dec 12 17:47:59 2000
-+++ rpm-4.0.2/scripts/Makefile.am	Fri Aug 10 12:44:47 2001
-@@ -9,7 +9,8 @@
- 	find-prov.pl find-req.pl cpanflute find-provides.perl \
- 	find-requires.perl get_magic.pl getpo.sh http.req \
- 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
--	trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
-+	trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh \
-+	find-perl-requires find-perl-provides
- 
- installprefix = $(DESTDIR)
- 
-@@ -23,4 +24,5 @@
- 	find-prov.pl find-req.pl cpanflute find-provides.perl \
- 	find-requires.perl get_magic.pl getpo.sh http.req \
- 	magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
--	vpkg-provides.sh vpkg-provides2.sh
-+	vpkg-provides.sh vpkg-provides2.sh \
-+	find-perl-requires find-perl-provides
---- rpm-4.0.2/scripts/perl.prov.wiget	Mon Jan 17 19:58:36 2000
-+++ rpm-4.0.2/scripts/perl.prov	Fri Aug 10 12:44:47 2001
-@@ -47,7 +47,9 @@
- 
- if ("@ARGV") {
-   foreach (@ARGV) {
--    process_file($_);
-+     if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
-+      process_file($_);
-+    }
-   }
- } else {
- 
-@@ -55,7 +57,9 @@
-   # contents of the file.
- 
-   foreach (<>) {
--    process_file($_);
-+     if (! m=(/(doc|usr/src)/|\.(so|gz|ph|pod|h|html)$)=) {
-+      process_file($_);
-+    }
-   }
- }
- 
---- rpm-4.0.2/scripts/perl.req.wiget	Mon Jan 17 19:58:36 2000
-+++ rpm-4.0.2/scripts/perl.req	Fri Aug 10 12:44:47 2001
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!@PERL@
- 
- # RPM (and it's source code) is covered under two separate licenses. 
- 
-@@ -41,7 +41,11 @@
+--- rpm-5.3.1/configure.ac.wiget	2010-05-22 17:15:11.000000000 +0200
++++ rpm-5.3.1/configure.ac	2010-05-30 16:37:59.526924459 +0200
+@@ -1100,7 +1100,7 @@ AC_CONFIG_FILES([ po/Makefile.in
+ 
+ AC_CONFIG_FILES([Makefile
+ 	rpmio/Makefile lib/Makefile build/Makefile sign/Makefile
+-	po/Makefile.in scripts/Makefile fileattrs/Makefile
++	po/Makefile.in scripts/Makefile scripts/perl.req scripts/perl.prov fileattrs/Makefile
+ 	misc/Makefile 
+ 	doc/Makefile
+ 	python/Makefile
+--- rpm-5.3.1/scripts/perl.req.wiget	2008-10-26 10:50:53.000000000 +0100
++++ rpm-5.3.1/scripts/perl.req	2010-05-30 16:35:36.999438206 +0200
+@@ -45,7 +45,11 @@
  
  if ("@ARGV") {
    foreach (@ARGV) {
@@ -61,10 +23,10 @@
 +    }
    }
  } else {
-   
-@@ -49,14 +53,22 @@
+ 
+@@ -53,7 +57,11 @@
    # contents of the file.
-   
+ 
    foreach (<>) {
 -    process_file($_);
 +     if (m=/usr/(sbin|bin|lib|share|X11R6/(lib|bin))/=) {
@@ -75,23 +37,63 @@
    }
  }
  
- 
- foreach $module (sort keys %require) {
-   if (length($require{$module}) == 0) {
--    print "perl($module)\n";
-+     if ($module =~ /^[0-9._]+$/) {
-+       print "perl >= $module\n";
-+     } else {
-+         print "perl($module)\n";
-+     }
-   } else {
- 
-     # I am not using rpm3.0 so I do not want spaces arround my
-@@ -183,7 +195,31 @@
+@@ -261,19 +269,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/) {
+-        $perlreq{"0:$ver"} = 1;
+-        next;
+-      }
+-      else {
+-        $perlreq{"1:$ver"} = 1;
+-        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) {
++	      print "perl-base >= 0:5.00$1_$3\n";
++	    } else {
++	      print "perl-base >= 0:5.00$1\n";
++	    }
++	  } else {
++	    print "perl-base >= 1:$ver\n";
++	  }
++	} else {
++	  # $]-style
++	  if ($ver =~ m/5\.(00[0-5])_?([0-9]+)?$/) {
++	    if (defined $2) {
++	      print "perl-base >= 0:5.$1_$2\n";
++	    } else {
++	      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)$/;
++	    print "perl-base >= 1:$1.$2.$3\n";
++	  }
++	}
++	next;
+ 
+       };
+ 
+@@ -290,7 +320,31 @@
        # will be included with the name sys/systeminfo.ph so only use the
        # basename of *.ph files
  
--      ($module  =~ m/\.ph$/) && ($module =~ s!.*/!!g );
+-      ($module =~ m/\.ph$/) && next;
 +      # ($module  =~ m/\.ph$/) && ($module =~ s!.*/!!g );
 +
 +      # there is no need to generate dependencies for ph, pl or test files
@@ -118,39 +120,5 @@
 +
 +      $module =~ s/\(\s*\)$//;
  
- 
-       $require{$module}=$version;
---- rpm-4.0.2/configure.in.wiget	Sun Feb 25 18:13:26 2001
-+++ rpm-4.0.2/configure.in	Fri Aug 10 12:48:21 2001
-@@ -186,6 +186,7 @@
-     AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
-     AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
-     AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
-+    AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
-     AC_MSG_CHECKING(old version of patch)
-     PATCHVERSION=`patch --version 2>&1`
- 
-@@ -1086,6 +1087,7 @@
- 
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
-+ 	macros.perl scripts/perl.req scripts/perl.prov
- 	rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
- 	scripts/Makefile
- 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
---- rpm-4.0.2/macros.in.wiget	Fri Aug 10 12:44:47 2001
-+++ rpm-4.0.2/macros.in	Fri Aug 10 12:44:47 2001
-@@ -626,9 +626,11 @@
- #	%{perl_sitearch}/Image
- #	%dir %{perl_sitearch}/auto/Image
- #
-+#
-+# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros 
-+#	has been moved to macros.perl (see info in this file for details).
-+#
- %requires_eq()	%(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
--%perl_sitearch	%(eval "`perl -V:installsitearch`"; echo $installsitearch)
--%perl_archlib	%(eval "`perl -V:installarchlib`"; echo $installarchlib)
- 
- #------------------------------------------------------------------------------
- # arch macro for all Intel i?86 compatibile processors
+       # use base|parent qw(Foo) dependencies
+       if ($statement eq "use" && ($module eq "base" || $module eq "parent")) {