X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-perl-macros.patch;h=2648466887bda5884a6a0945714365c1b74a239f;hb=63ea47af96cacd4a52787c03ea344cc358b474cc;hp=80e85b15b923548369e4c5da7e0669e17212aa55;hpb=7e59949bbd529fbde22ec4735a4b2d2f800544dd;p=packages%2Frpm.git

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 80e85b1..2648466 100644
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,51 +1,20 @@
---- rpm-4.0/scripts/Makefile.am.wiget	Wed Jul  5 14:26:37 2000
-+++ rpm-4.0/scripts/Makefile.am	Wed Nov 15 21:31:03 2000
-@@ -8,7 +8,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 u_pkg.sh \
--	vpkg-provides.sh vpkg-provides2.sh
-+	vpkg-provides.sh vpkg-provides2.sh \
-+	find-perl-requires find-perl-provides
- 
- installprefix = $(DESTDIR)
- 
-@@ -21,4 +22,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/scripts/perl.prov.wiget	Mon Jan 17 19:58:36 2000
-+++ rpm-4.0/scripts/perl.prov	Wed Nov 15 21:31:03 2000
-@@ -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/scripts/perl.req.wiget	Mon Jan 17 19:58:36 2000
-+++ rpm-4.0/scripts/perl.req	Wed Nov 15 21:31:03 2000
+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. 
  
@@ -87,13 +56,13 @@
    } 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.
 +
@@ -118,39 +87,5 @@
 +
 +      $module =~ s/\(\s*\)$//;
  
- 
        $require{$module}=$version;
---- rpm-4.0/configure.in.wiget	Wed Nov 15 21:31:03 2000
-+++ rpm-4.0/configure.in	Wed Nov 15 21:34:55 2000
-@@ -181,6 +181,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`
- 
-@@ -952,6 +953,7 @@
- 
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt 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/macros.in.wiget	Wed Nov 15 21:31:03 2000
-+++ rpm-4.0/macros.in	Wed Nov 15 21:31:03 2000
-@@ -623,9 +623,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
+       $line{$module}=$_;