- updated for 4.0.1.

Changed files:
    rpm-macros.patch -> 1.19
    rpm-perl-macros.patch -> 1.25
    rpm-rpmrc.patch -> 1.14

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 996e4aadc76028f09732d368e47c62fb54d1db75..562a13a0389239067a055b448cec0764084a78a3 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,19 +1,19 @@
-diff -Nru rpm-4.0/configure.in rpm-4.0.new/configure.in
---- rpm-4.0/configure.in       Tue Aug 29 22:55:50 2000
-+++ rpm-4.0.new/configure.in   Wed Nov 15 19:15:17 2000
-@@ -951,7 +951,7 @@
+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:22:16 2001
++++ rpm-4.0.1.new/configure.in Wed Jan 31 13:23:24 2001
+@@ -1042,7 +1042,7 @@
  dnl export LIBS INCPATH CONFIG_SITE
  
  AC_CONFIG_SUBDIRS(popt)
--AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
-+AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt scripts/brp-redhat
+-AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
++AC_OUTPUT([Doxyfile Makefile rpmrc macros macros.pld platform rpmpopt rpm.spec scripts/brp-redhat
        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/macros.in rpm-4.0.new/macros.in
---- rpm-4.0/macros.in  Mon Aug 28 17:24:45 2000
-+++ rpm-4.0.new/macros.in      Wed Nov 15 19:12:09 2000
-@@ -88,7 +88,7 @@
+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:22:16 2001
++++ rpm-4.0.1.new/macros.in    Wed Jan 31 13:24:31 2001
+@@ -90,7 +90,7 @@
  %_bzip2bin            @BZIP2BIN@
  %_dbpath              %{_var}/lib/rpm
  %_dbpath_rebuild      %{_dbpath}
@@ -22,7 +22,7 @@ diff -Nru rpm-4.0/macros.in rpm-4.0.new/macros.in
  #
  %__find_provides      @FINDPROVIDES@
  %__find_requires      @FINDREQUIRES@
-@@ -100,8 +100,8 @@
+@@ -102,8 +102,8 @@
  %__id_u                       @__ID_U@
  %__chown_Rhf          @__CHOWN_RHF@
  %__chgrp_Rhf          @__CHGRP_RHF@
@@ -33,7 +33,7 @@ diff -Nru rpm-4.0/macros.in rpm-4.0.new/macros.in
  %_fixperms            %{__chmod} -Rf @FIXPERMS@
  #
  %_gzipbin             @GZIPBIN@
-@@ -110,13 +110,13 @@
+@@ -112,13 +112,13 @@
  %_rpmdir              %{_topdir}/RPMS
  #
  # XXX Note escaped %% for use in headerSprintf
@@ -46,10 +46,10 @@ diff -Nru rpm-4.0/macros.in rpm-4.0.new/macros.in
  %_tmppath             %{_var}/tmp
 -%_topdir              %{_usrsrc}/redhat
 +%_topdir              %(echo $HOME)/rpm
+ %_unzipbin            @UNZIPBIN@
  
  #==============================================================================
- # ---- Optional rpmrc macros.
-@@ -455,15 +455,15 @@
+@@ -461,15 +461,15 @@
  %_sbindir             %{_exec_prefix}/sbin
  %_libexecdir          %{_exec_prefix}/libexec
  %_datadir             %{_prefix}/share

diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch
index 80e85b15b923548369e4c5da7e0669e17212aa55..88ef6649976f6e27eebb3c203155d4758f4d7394 100644 (file)
--- a/rpm-perl-macros.patch
+++ b/rpm-perl-macros.patch
@@ -1,24 +1,62 @@
---- 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 @@
+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 u_pkg.sh \
--      vpkg-provides.sh vpkg-provides2.sh
-+      vpkg-provides.sh vpkg-provides2.sh \
+       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)
  
-@@ -21,4 +22,5 @@
+@@ -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/scripts/perl.prov.wiget    Mon Jan 17 19:58:36 2000
-+++ rpm-4.0/scripts/perl.prov  Wed Nov 15 21:31:03 2000
+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") {
@@ -41,8 +79,9 @@
    }
  }
  
---- 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 -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
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
 +#!@PERL@
@@ -120,37 +159,3 @@
  
  
        $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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 6546655380bf9b959869e94337cff234e6882147..18a0d155c8df8253465980952d1b0947b5bf0df2 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,6 +1,6 @@
-diff -Nru rpm-4.0/rpmrc.in rpm-4.0.new/rpmrc.in
---- rpm-4.0/rpmrc.in   Wed Sep 13 20:03:46 2000
-+++ rpm-4.0.new/rpmrc.in       Wed Nov 15 19:11:00 2000
+diff -Nru rpm-4.0.1/rpmrc.in rpm-4.0.1.new/rpmrc.in
+--- rpm-4.0.1/rpmrc.in Wed Jan 31 13:19:02 2001
++++ rpm-4.0.1.new/rpmrc.in     Wed Jan 31 13:20:51 2001
 @@ -9,7 +9,7 @@
  # Values for RPM_OPT_FLAGS for various platforms
  
@@ -10,10 +10,10 @@ diff -Nru rpm-4.0/rpmrc.in rpm-4.0.new/rpmrc.in
  optflags: i386 -O2 -march=i386 -mcpu=i686
  optflags: i486 -O2 -march=i486
  optflags: i586 -O2 -march=i586
-@@ -291,5 +291,5 @@
+@@ -289,5 +289,5 @@
  buildarch_compat: ia64: noarch
  buildarch_compat: s390: noarch
  
--macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
-+macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/macros.pld:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
+-macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
++macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/macros.pld:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros.db1:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros