-diff -Nru rpm-3.0.5/rpmrc.in rpm-3.0.5.new/rpmrc.in
---- rpm-3.0.5/rpmrc.in Sun Jul 9 17:35:56 2000
-+++ rpm-3.0.5.new/rpmrc.in Tue Jul 25 10:16:43 2000
-@@ -2,12 +2,12 @@
-
- #############################################################
-
--# Please send new entries to rpm-list@redhat.com
-+# Please send new entries to pld-list@pld.org.pl
-
- #############################################################
+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
--optflags: i386 -O2 -m486 -fno-strength-reduce
+ # 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 -mcpu=i686
+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
-@@ -260,5 +260,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