cleanup

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index c338c5461570879f8096b49e8c2ec083cab6fec7..5598d48da289db2567a82dff82557e45a0b61444 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,25 +1,20 @@
-diff -Nur rpm-2.5.6/lib-rpmrc.in rpm-2.5.6.pld/lib-rpmrc.in
---- rpm-2.5.6/lib-rpmrc.in     Fri Feb  5 09:59:38 1999
-+++ rpm-2.5.6.pld/lib-rpmrc.in Fri Feb  5 09:57:57 1999
-@@ -12,17 +12,20 @@
- bzip2bin:     @BZIP2BIN@
- defaultdocdir:  @prefix@/doc
- fixperms:     @FIXPERMS@
-+Vendor:               PLD
- rpmfilename:    %{ARCH}/%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}.rpm
- instchangelog:        5
- 
- #############################################################
+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
  
- # Please send new entries to rpm-list@redhat.com
-+ 
-+# Plesae send new entries to pld-list@mailbox.tuniv.szczecin.pl
+ # 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
+@@ -289,5 +289,5 @@
+ buildarch_compat: ia64: noarch
+ buildarch_compat: s390: noarch
  
- #############################################################
- # Values for RPM_OPT_FLAGS for various platforms
+-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
  
--optflags: i386 -O2 -m486 -fno-strength-reduce
-+optflags: i386 -O6 -mpentium -fomit-frame-pointer
- optflags: alpha -O2
- optflags: sparc -O2
- optflags: sparc64 -O2