- updated for 4.0.

Changed files:
    rpm-macros.patch -> 1.17
    rpm-rpmpopt.patch -> 1.5
    rpm-rpmrc.patch -> 1.13

diff --git a/rpm-macros.patch b/rpm-macros.patch
index 721f82a5f17a8d1cfeae927baa51a59a7383d7da..f3d54b59ef11dfc9a8fe393fc51c72cdb45a9674 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -1,18 +1,18 @@
-diff -urN rpm-3.0.5.orig/configure.in rpm-3.0.5/configure.in
---- rpm-3.0.5.orig/configure.in        Sun Jul 16 21:02:26 2000
-+++ rpm-3.0.5/configure.in     Sat Jul 29 23:58:18 2000
-@@ -913,7 +913,7 @@
+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 @@
  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
-       lib/Makefile build/Makefile tools/Makefile scripts/Makefile
+       rpmio/Makefile 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
-diff -Nru rpm-3.0.6/macros.in rpm-3.0.6.new/macros.in
---- rpm-3.0.6/macros.in        Mon Nov  6 20:36:09 2000
-+++ rpm-3.0.6.new/macros.in    Mon Nov  6 20:37:24 2000
+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 @@
  %_bzip2bin            @BZIP2BIN@
  %_dbpath              %{_var}/lib/rpm
@@ -49,7 +49,7 @@ diff -Nru rpm-3.0.6/macros.in rpm-3.0.6.new/macros.in
  
  #==============================================================================
  # ---- Optional rpmrc macros.
-@@ -407,15 +407,15 @@
+@@ -455,15 +455,15 @@
  %_sbindir             %{_exec_prefix}/sbin
  %_libexecdir          %{_exec_prefix}/libexec
  %_datadir             %{_prefix}/share

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 167b45b62812c4ad2ecdd2929f8cf7b4869b3744..1db688bb4dd8079bb7522fcecaf58f2b89cef8d2 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -1,10 +1,10 @@
---- rpm-3.0.4/rpmpopt.in.wiget Wed Feb 23 23:40:53 2000
-+++ rpm-3.0.4/rpmpopt.in       Wed Mar 22 17:39:52 2000
-@@ -81,3 +81,12 @@
- 
+diff -Nru rpm-4.0/rpmpopt.in rpm-4.0.new/rpmpopt.in
+--- rpm-4.0/rpmpopt.in Wed Nov 15 19:18:35 2000
++++ rpm-4.0.new/rpmpopt.in     Wed Nov 15 19:18:15 2000
+@@ -80,6 +80,14 @@
  # Build policies enabled from command line. Last policy applies.
- rpm alias --buildpolicy --define '__spec_install_post @RPMCONFIGDIR@/brp-!#:+'
-+
+ rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
+ 
 +# Make RPM build tree
 +rpm exec --install-build-tree install-build-tree
 +
@@ -12,5 +12,7 @@
 +rpm alias --debug --define 'debug 1'
 +
 +# Don't remove $BUILDROOT if --noclean
-+rpm alias --noclean --define '__spec_clean_pre exit 0'
-\ No newline at end of file
++
+ # Choose db interface:
+ #     0       same as 1
+ #     1       native db1 interface (e.g. linux glibc libdb1 routines).

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 259737ab7b197a5d2b3fc19332697aee4fbd68b5..6546655380bf9b959869e94337cff234e6882147 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,16 +1,16 @@
-diff -Nru rpm-3.0.6/rpmrc.in rpm-3.0.6.new/rpmrc.in
---- rpm-3.0.6/rpmrc.in Wed Sep 13 19:55:15 2000
-+++ rpm-3.0.6.new/rpmrc.in     Thu Oct 12 15:49:35 2000
-@@ -8,7 +8,7 @@
- #############################################################
+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
+@@ -9,7 +9,7 @@
  # Values for RPM_OPT_FLAGS for various platforms
  
--optflags: i386 -O2 -m486 -fno-strength-reduce
-+optflags: i386 -O2 -march=i386
+ # XXX this is the i386 optflags that rpm has traditionally used in the past.
+-#optflags: i386 -O2 -m486 -fno-strength-reduce
++#optflags: i386 -O2 -march=i386
+ optflags: i386 -O2 -march=i386 -mcpu=i686
  optflags: i486 -O2 -march=i486
  optflags: i586 -O2 -march=i586
- optflags: i686 -O2 -march=i686
-@@ -289,5 +289,5 @@
+@@ -291,5 +291,5 @@
  buildarch_compat: ia64: noarch
  buildarch_compat: s390: noarch