- added some missing German translations

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 384fc466b1631400c70559cb2a5d7dec88cf9377..5598d48da289db2567a82dff82557e45a0b61444 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,58 +1,20 @@
-diff -ur rpm-3.0.1.old/rpmrc.in rpm-3.0.1/rpmrc.in
---- rpm-3.0.1.old/rpmrc.in     Fri Jun  4 20:34:49 1999
-+++ rpm-3.0.1/rpmrc.in Fri Jun  4 20:36:31 1999
-@@ -4,25 +4,30 @@
- 
- # 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: alpha -O2
--optflags: sparc -O2
--optflags: sparc64 -O2
--optflags: m68k -O2 -fomit-frame-pointer
--optflags: ppc -O2 -fsigned-char
--optflags: parisc -O2 -mpa-risc-1-0
--optflags: hppa1.0 -O2 -mpa-risc-1-0
--optflags: hppa1.1 -O2 -mpa-risc-1-0
--optflags: hppa1.2 -O2 -mpa-risc-1-0
--optflags: hppa2.0 -O2 -mpa-risc-1-0
--optflags: mipseb -O2
--optflags: mipsel -O2
--optflags: armv4 -O2 -fsigned-char -fomit-frame-pointer
--optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer
--optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer
-+optflags: i386 -O2 -g
-+optflags: i486 -O2 -g
-+optflags: i586 -O2 -mpentium -g
-+optflags: i686 -O2 -mpentiumpro -g
-+optflags: alpha -O2 -g
-+optflags: sparc -O2 -g 
-+optflags: sparc64 -O2 -g
-+optflags: m68k -O2 -fomit-frame-pointer -g
-+optflags: ppc -O2 -fsigned-char -g
-+optflags: parisc -O2 -mpa-risc-1-0 -g
-+optflags: hppa1.0 -O2 -mpa-risc-1-0 -g 
-+optflags: hppa1.1 -O2 -mpa-risc-1-0 -g
-+optflags: hppa1.2 -O2 -mpa-risc-1-0 -g 
-+optflags: hppa2.0 -O2 -mpa-risc-1-0 -g
-+optflags: mipseb -O2 -g
-+optflags: mipsel -O2 -g
-+optflags: armv4 -O2 -fsigned-char -fomit-frame-pointer -g
-+optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -g
-+optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -g
- 
- #############################################################
- # Canonical arch names and numbers
-@@ -202,6 +207,6 @@
- #############################################################
- #macrofiles:  @RPMCONFIGDIR@/macros:@SYSCONFIGDIR@/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
+@@ -289,5 +289,5 @@
+ buildarch_compat: ia64: noarch
+ buildarch_compat: s390: noarch
  
--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
+-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
  
- #include: @RPMCONFIGDIR@/%{_target}/rpmrc