- Th version, based on find-java-req.sh:AC-branch

[packages/rpm.git] / rpm-perl-macros.patch

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index b560053739df222f5f24e0cb2eaf9aa37358ee92..601c0598ba2a04eba380519de79cc5cdabf561d7 100644 (file)
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,37 +1,17 @@
---- rpm-4.1/scripts/Makefile.am.wiget  Thu Aug 22 19:31:42 2002
-+++ rpm-4.1/scripts/Makefile.am        Wed Sep 18 23:52:19 2002
-@@ -31,4 +31,5 @@
-       magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
-       rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
-       sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
-+      find-perl-requires find-perl-provides \
-       vpkg-provides.sh vpkg-provides2.sh
---- rpm-4.1/scripts/perl.prov.wiget    Fri Feb  1 16:20:26 2002
-+++ rpm-4.1/scripts/perl.prov  Wed Sep 18 23:50:15 2002
-@@ -47,7 +47,9 @@
+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
+@@ -1196,6 +1196,7 @@
+ AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
  
- 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.1/scripts/perl.req.wiget     Mon Jun  3 22:56:33 2002
-+++ rpm-4.1/scripts/perl.req   Wed Sep 18 23:50:15 2002
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
++      scripts/perl.req scripts/perl.prov
+       rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+       scripts/Makefile scripts/brp-redhat
+       scripts/macros.perl scripts/macros.php scripts/macros.python
+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@
@@ -76,7 +56,7 @@
    } else {
  
      # I am not using rpm3.0 so I do not want spaces arround my
-@@ -209,7 +221,31 @@
+@@ -219,7 +231,31 @@
        # will be included with the name sys/systeminfo.ph so only use the
        # basename of *.ph files
  
@@ -109,28 +89,3 @@
  
        $require{$module}=$version;
        $line{$module}=$_;
---- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002
-+++ rpm-4.1/configure.ac       Wed Sep 18 23:50:46 2002
-@@ -1194,6 +1194,7 @@
- AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
- 
- AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
-+      macros.perl scripts/perl.req scripts/perl.prov
-       rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
-       scripts/Makefile scripts/brp-redhat
-       scripts/macros.perl scripts/macros.php scripts/macros.python
---- rpm-4.1/macros.in.wiget    Sun Sep  1 00:30:19 2002
-+++ rpm-4.1/macros.in  Wed Sep 18 23:50:46 2002
-@@ -1012,8 +1012,10 @@
- #     %dir %{perl_sitearch}/auto/Image
- #
- %requires_eq()        %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
--%perl_sitearch        %(eval "`perl -V:installsitearch`"; echo $installsitearch)
--%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
-+#
-+# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros 
-+#     has been moved to macros.perl (see info in this file for details).
-+#
- 
- #------------------------------------------------------------------------------
- # arch macro for all Intel i?86 compatibile processors