- user/group deletion script

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

diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch
index 8ee579fa87e8a96ec71929b724921d47cfe17401..e90f252a0d113a528fb943cc7c4db2afaefa4ab5 100644 (file)
--- a/rpm-rpmrc.patch
+++ b/rpm-rpmrc.patch
@@ -1,7 +1,7 @@
-diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
---- rpm-4.3.org/rpmrc.in       2003-12-28 00:17:35.518360512 +0100
-+++ rpm-4.3/rpmrc.in   2003-12-28 00:25:19.224866408 +0100
-@@ -11,56 +11,58 @@
+diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
+--- rpm.org/rpmrc.in   2004-06-01 23:50:45.000000000 +0200
++++ rpm/rpmrc.in       2004-07-08 01:21:16.468982520 +0200
+@@ -11,60 +11,118 @@
  #############################################################
  # Values for RPM_OPT_FLAGS for various platforms
  
@@ -9,10 +9,13 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
 -optflags: i486 -O2 -g -march=i486
 -optflags: i586 -O2 -g -march=i586
 -optflags: i686 -O2 -g -march=i686
+-optflags: pentium3 -O2 -g -march=pentium3
+-optflags: pentium4 -O2 -g -march=pentium4
 -optflags: athlon -O2 -g -march=athlon
 -optflags: ia64 -O2 -g
 -optflags: x86_64 -O2 -g
 -optflags: amd64 -O2 -g
+-optflags: ia32e -O2 -g
 -
 -optflags: alpha -O2 -g -mieee
 -optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
@@ -22,6 +25,7 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
 -optflags: alphaev67 -O2 -g -mieee -mcpu=ev67
 -
 -optflags: sparc -O2 -g -m32 -mtune=ultrasparc
+-optflags: sparcv8 -O2 -g -m32 -mcpu=ultrasparc -mv8
 -optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc
 -optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc
 -
@@ -55,15 +59,71 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
 -
 -optflags: s390 -O2 -g
 -optflags: s390x -O2 -g
++optflags: i386 -O2 -march=i386 -mcpu=i686
++optflags: i486 -O2 -march=i486
++optflags: i586 -O2 -march=i586
++optflags: i686 -O2 -march=i686
++optflags: pentium3 -O2 -march=pentium3
++optflags: pentium4 -O2 -march=pentium4
++optflags: athlon -O2 -march=athlon
++optflags: ia64 -O2
++optflags: x86_64 -O2
++optflags: amd64 -O2
++optflags: ia32e -O2
++
++optflags: alpha -O2 -mieee
++optflags: alphaev5 -O2 -mieee -mcpu=ev5
++optflags: alphaev56 -O2 -mieee -mcpu=ev56
++optflags: alphapca56 -O2 -mieee -mcpu=pca56
++optflags: alphaev6 -O2 -mieee -mcpu=ev6
++optflags: alphaev67 -O2 -mieee -mcpu=ev67
++
++optflags: sparc -O2 -m32 -mtune=ultrasparc
++optflags: sparcv8 -O2 -m32 -mcpu=ultrasparc -mv8
++optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc
++optflags: sparc64 -O2 -m64 -mcpu=ultrasparc
++
++optflags: m68k -O2 -fomit-frame-pointer
++
++optflags: ppc -O2 -fsigned-char
++optflags: ppciseries -O2 -fsigned-char
++optflags: ppcpseries -O2 -fsigned-char
++optflags: ppc64 -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: mips -O2
++optflags: mipsel -O2
++
++optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3
++optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4
++optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4
++
++optflags: atarist -O2 -fomit-frame-pointer
++optflags: atariste -O2 -fomit-frame-pointer
++optflags: ataritt -O2 -fomit-frame-pointer
++optflags: falcon -O2 -fomit-frame-pointer
++optflags: atariclone -O2 -fomit-frame-pointer
++optflags: milan -O2 -fomit-frame-pointer
++optflags: hades -O2 -fomit-frame-pointer
++
++optflags: s390 -O2
++optflags: s390x -O2
++
 +optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}}
-+#optflags: i386 -O2 -march=i386 -mcpu=i686
++#optflags: i386 -O2 -march=i486 -mcpu=pentium4
 +optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}}
 +optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}}
 +optflags: i686 -O2 -march=i686%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}}
 +optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}}
 +optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}}
-+optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}} %{?specflags_amd64: %{specflags_amd64}} }
-+optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}} %{?specflags_x86_64: %{specflags_x86_64}}}
++optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}}
++optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}}
++optflags: ia32e -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32e: %{specflags_ia32e}}}
 +
 +optflags: alpha -O2 -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}}
 +optflags: alphaev5 -O2 -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}}
@@ -73,8 +133,9 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
 +optflags: alphaev67 -O2 -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}}
 +
 +optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}}
++optflags: sparcv8 -O2 -m32 -mcpu=ultrasparc -mv8%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv8: %{specflags_sparcv8}}}
 +optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}}
-+optflags: sparc64 -O2 -m64 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
++optflags: sparc64 -O2 -m64 -mcpu=ultrasparc -Wcast-align%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}}
 +
 +optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}}
 +
@@ -107,6 +168,9 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in
 +optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
 +optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
 +
++  
++  #############################################################
++  # Canonical arch names and numbers
  
  #############################################################
  # Canonical arch names and numbers