- reverted last changes - other packages were broken

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 57854d805316619d52489430684b3cef14223e0a..71901c907bf1fcbe1c6f7c78c213c8342566c4c4 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,27 +1,14 @@
---- rpm-2.93/rpmrc.in.rpmrc    Sun Apr  4 22:10:34 1999
-+++ rpm-2.93/rpmrc.in  Thu Apr  8 18:32:21 1999
-@@ -4,10 +4,15 @@
- 
- # Please send new entries to rpm-list@redhat.com
- 
-+# Plesae 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
-+optflags: i386 -O2
-+optflags: i486 -O2
-+optflags: i586 -O2 -mpentium
-+optflags: i686 -O2 -mpentiumpro
- optflags: alpha -O2
- optflags: sparc -O2
- optflags: sparc64 -O2
-@@ -187,6 +192,6 @@
- #############################################################
- #macrofiles:  @RPMCONFIGDIR@/macros:@SYSCONFIGDIR@/macros:~/.rpmmacros
- 
--macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
-+macrofiles:   @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@RPMCONFIGDIR@/macros.pld:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros
+ # 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
  
- #include: @RPMCONFIGDIR@/%{_target}/rpmrc