X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-perl-macros.patch;h=2648466887bda5884a6a0945714365c1b74a239f;hp=88ef6649976f6e27eebb3c203155d4758f4d7394;hb=d65f5d0edf38dd0aee50cea6d567bbafe25784f1;hpb=1e537e49c952f46a4b65000ab50e1e8bba32be3f

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 88ef664..2648466 100644
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,90 +1,20 @@
-diff -Nru rpm-4.0.1/configure.in rpm-4.0.1.new/configure.in
---- rpm-4.0.1/configure.in	Wed Jan 31 13:37:21 2001
-+++ rpm-4.0.1.new/configure.in	Wed Jan 31 13:49:25 2001
-@@ -185,6 +185,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`
- 
-@@ -1043,6 +1044,7 @@
- 
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld 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
-diff -Nru rpm-4.0.1/macros.in rpm-4.0.1.new/macros.in
---- rpm-4.0.1/macros.in	Wed Jan 31 13:37:21 2001
-+++ rpm-4.0.1.new/macros.in	Wed Jan 31 13:38:04 2001
-@@ -629,9 +629,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
-diff -Nru rpm-4.0.1/scripts/Makefile.am rpm-4.0.1.new/scripts/Makefile.am
---- rpm-4.0.1/scripts/Makefile.am	Wed Jan 31 13:37:21 2001
-+++ rpm-4.0.1.new/scripts/Makefile.am	Wed Jan 31 14:27:28 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
-diff -Nru rpm-4.0.1/scripts/perl.prov rpm-4.0.1.new/scripts/perl.prov
---- rpm-4.0.1/scripts/perl.prov	Wed Jan 31 13:37:21 2001
-+++ rpm-4.0.1.new/scripts/perl.prov	Wed Jan 31 13:38:04 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($_);
-+    }
-   }
- }
- 
-diff -Nru rpm-4.0.1/scripts/perl.req rpm-4.0.1.new/scripts/perl.req
---- rpm-4.0.1/scripts/perl.req	Wed Jan 31 13:37:21 2001
-+++ rpm-4.0.1.new/scripts/perl.req	Wed Jan 31 13:38:04 2001
+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
+diff -urN rpm-4.3.org/scripts/perl.req rpm-4.3/scripts/perl.req
+--- rpm-4.3.org/scripts/perl.req	2004-01-07 01:51:04.911464416 +0100
++++ rpm-4.3/scripts/perl.req	2004-01-07 01:55:17.030076058 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
-+#!@PERL@
++#!@__PERL@
  
  # RPM (and it's source code) is covered under two separate licenses. 
  
@@ -126,13 +56,13 @@ diff -Nru rpm-4.0.1/scripts/perl.req rpm-4.0.1.new/scripts/perl.req
    } else {
  
      # I am not using rpm3.0 so I do not want spaces arround my
-@@ -183,7 +195,31 @@
+@@ -219,7 +231,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
 +      # so let's just skip them.
 +
@@ -157,5 +87,5 @@ diff -Nru rpm-4.0.1/scripts/perl.req rpm-4.0.1.new/scripts/perl.req
 +
 +      $module =~ s/\(\s*\)$//;
  
- 
        $require{$module}=$version;
+       $line{$module}=$_;