X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-perl-macros.patch;h=c99ad2e3e51fa754270c0af85d235c8405ea085f;hp=6a29e91872324b09b9f119d18b074bf645286691;hb=96a1333d14bbb384fa0a18789ec327575692dcdd;hpb=7b92670531a24fe6419600de7ac9d3f69ca1839b

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 6a29e91..c99ad2e 100644
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,128 +1,129 @@
---- rpm-3.0.3.perl/configure.in	Fri Oct 22 14:23:17 1999
-+++ rpm-3.0.3/configure.in	Fri Oct 22 14:47:01 1999
-@@ -906,7 +906,7 @@
- export LIBS INCPATH CONFIG_SITE
+--- 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
+@@ -2198,6 +2198,7 @@ AC_CONFIG_FILES([ po/Makefile.in
+     build/Makefile build/auto/Makefile build/auto/desc build/auto/types
+     tools/Makefile
+     scripts/Makefile
++    scripts/perl.req scripts/perl.prov
+     rpmdb/DB_CONFIG
+     macros/macros macros/macros.rpmbuild
+     macros/java macros/libtool macros/mono macros/perl 
+--- 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
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!@__PERL@
  
- AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Makefile rpmrc macros macros.pld lib/Makefile
-+AC_OUTPUT([Makefile rpmrc macros macros.pld macros.perl lib/Makefile
- 	build/Makefile tools/Makefile scripts/Makefile
- 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
- 	misc/Makefile po/Makefile.in intl/Makefile
---- rpm-3.0.3.perl/macros.in	Fri Oct 22 14:23:17 1999
-+++ rpm-3.0.3/macros.in	Fri Oct 22 14:59:08 1999
-@@ -248,6 +248,8 @@
- #	%{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)
---- rpm-3.0.3.perl/macros.perl.in	Thu Jan  1 01:00:00 1970
-+++ rpm-3.0.3/macros.perl.in	Fri Oct 22 15:08:15 1999
-@@ -0,0 +1,11 @@
-+# Perl specific macro definitions.
-+# To make use of these macros insert the following line into your spec file:
-+# %include @RPMCONFIGDIR@/macros.perl
-+
-+%define		__find_requires	@RPMCONFIGDIR@/find-perl-requires
-+%define		__find_provides	@RPMCONFIGDIR@/find-perl-provides
-+
-+%define		perl_sitelib	%(eval "`perl -V:installsitelib`"; echo $installsitelib)
-+%define		perl_sitearch	%(eval "`perl -V:installsitearch`"; echo $installsitearch)
-+%define		perl_archlib	%(eval "`perl -V:installarchlib`"; echo $installarchlib)
-+
---- rpm-3.0.3.perl/scripts/Makefile.am	Sat Jun  5 22:52:30 1999
-+++ rpm-3.0.3/scripts/Makefile.am	Fri Oct 22 15:12:12 1999
-@@ -4,7 +4,8 @@
- 
- EXTRA_DIST = \
- 	convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
--	perl.prov perl.req vpkg-provides.sh
-+	perl.prov perl.req find-perl-requires find-perl-provides \
-+	vpkg-provides.sh
+ # RPM (and its source code) is covered under two separate licenses. 
  
- installprefix = $(DESTDIR)
+@@ -41,7 +41,11 @@
  
-@@ -13,5 +14,6 @@
- configdir = ${prefix}/lib/rpm
- config_SCRIPTS = \
- 	convertrpmrc.sh find-lang.sh freshen.sh getpo.sh \
--	perl.prov perl.req vpkg-provides.sh
-+	perl.prov perl.req find-perl-requires find-perl-provides \
-+	vpkg-provides.sh
- 
---- rpm-3.0.3.perl/scripts/find-perl-provides	Thu Jan  1 01:00:00 1970
-+++ rpm-3.0.3/scripts/find-perl-provides	Fri Oct 22 12:21:39 1999
-@@ -0,0 +1,8 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+
-+echo $filelist|/usr/lib/rpm/find-provides
-+/usr/lib/rpm/perl.prov $filelist
-+
---- rpm-3.0.3.perl/scripts/find-perl-requires	Thu Jan  1 01:00:00 1970
-+++ rpm-3.0.3/scripts/find-perl-requires	Fri Oct 22 12:21:36 1999
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+ulimit -c 0
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+
-+requires="`echo $filelist|/usr/lib/rpm/find-requires`"
-+requires_perl="`/usr/lib/rpm/perl.req $filelist`"
-+requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n"  $requires_perl 2>/dev/null`"
-+echo "$requires
-+$requires_perl
-+$requires_mod"|  sort -u
---- rpm-3.0.3.perl/scripts/perl.prov	Sat Jun  5 22:52:31 1999
-+++ rpm-3.0.3/scripts/perl.prov	Fri Oct 22 14:34:50 1999
-@@ -30,12 +30,12 @@
-   if (length($require{$module}) == 0) {
-    print "perl($module)\n";
-   } else {
--    print "perl($module)=$require{$module}\n";
-+    print "perl($module) = $require{$module}\n";
- 
-     # we need to print it without the version number until the
-     # requires syntax accepts version numbers correctly.
- 
--    print "perl($module)\n";
-+#    print "perl($module)\n";
+ 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 @@ if ("@ARGV") {
+   # 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($_);
++       }
++     }
    }
  }
  
---- rpm-3.0.3.perl/scripts/perl.req	Sat Jun  5 22:52:31 1999
-+++ rpm-3.0.3/scripts/perl.req	Fri Oct 22 12:21:33 1999
-@@ -26,16 +26,22 @@
+@@ -215,19 +223,41 @@ sub process_file {
  
+       $module =~ s/\(\s*\)$//;
  
- foreach $module (sort keys %require) {
-   if (length($require{$module}) == 0) {
--    print "perl($module)\n";
-+    if ($module =~ /^[0-9._]+$/) {
-+      print "perl >= $module\n";
-+    } else {
-+      if ($module !~ /\.ph$/ && $module !~ /\.pl/) {
-+        print "perl($module)\n";
-+      }
-+    }
-   } else {
+-      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
  
--    print "perl($module)>=$require{$module}\n";
-+    print "perl($module) >= $require{$module}\n";
+-      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) {
++	      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;
  
-     # we need to print it without the version number until the
-     # requires syntax accepts version numbers correctly.
+       };
  
--    print "perl($module)\n";
-+#    print "perl($module)\n";
-   }
- }
+@@ -244,7 +274,31 @@ sub process_file {
+       # will be included with the name sys/systeminfo.ph so only use the
+       # basename of *.ph files
+ 
+-      ($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*\)$//;
  
+       $require{$module}=$version;
+       $line{$module}=$_;