- renamed popt patch, STBR

[packages/rpm.git] / rpm-rpmrc.patch

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index bcdc34a7a4a739c6cd986c112d6cbfc80d262f46..71901c907bf1fcbe1c6f7c78c213c8342566c4c4 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,26 +1,14 @@
---- rpm-3.0.4/rpmrc.in.wiget   Wed Mar  1 00:22:44 2000
-+++ rpm-3.0.4/rpmrc.in Wed Mar 22 16:53:54 2000
-@@ -4,10 +4,15 @@
- 
- # 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: i486 -O2 -march=i386
-+optflags: i586 -O2 -march=pentium
-+optflags: i686 -O2 -march=pentiumpro
- optflags: alpha -O2
- optflags: sparc -O2
- optflags: sparcv9 -O2 -mv8 -mtune=ultrasparc
-@@ -255,5 +260,5 @@
- buildarch_compat: milan: m68kmint noarch
- buildarch_compat: hades: m68kmint 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
++#optflags: i386 -O2 -march=i386 -mcpu=i686
+ optflags: i486 -O2 -march=i486
+ optflags: i586 -O2 -march=i586