- updated to 3.0.5

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 0bb2295022471c83ed336af4ad31586ef6f3e0d7..eff884ba1d06a8a1dc52454d128d896b02017aff 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,28 +1,25 @@
---- rpmrc.in~  Sat Jul  3 16:52:06 1999
-+++ rpmrc.in   Sat Jul 10 00:08:09 1999
-@@ -4,10 +4,15 @@
+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 rpm-list@redhat.com
 +# Please send new entries to pld-list@pld.org.pl
-+
+ 
  #############################################################
  # Values for RPM_OPT_FLAGS for various platforms
  
 -optflags: i386 -O2 -m486 -fno-strength-reduce
 +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: sparc64 -O2
-@@ -253,7 +258,7 @@
- #############################################################
- #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
+ optflags: i486 -O2 -march=i486
+ optflags: i586 -O2 -march=i586
+ optflags: i686 -O2 -march=i686
+@@ -260,5 +260,5 @@
+ buildarch_compat: ia64: noarch
+ buildarch_compat: s390: noarch
  
- #include: @RPMCONFIGDIR@/%{_target}/rpmrc
+-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