SOURCES (AC-branch): rpm-arch.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Fri Jun 17 14:37:15 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   rpm-arch.patch (1.5 -> 1.5.4.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-arch.patch
diff -u SOURCES/rpm-arch.patch:1.5 SOURCES/rpm-arch.patch:1.5.4.1
--- SOURCES/rpm-arch.patch:1.5	Sat Jan 26 14:11:50 2002
+++ SOURCES/rpm-arch.patch	Fri Jun 17 16:37:10 2005
@@ -1,28 +1,32 @@
-diff -urN rpm-3.0.5.orig/rpmrc.in rpm-3.0.5/rpmrc.in
---- rpm-3.0.5.orig/rpmrc.in	Sat Jul 29 23:56:53 2000
-+++ rpm-3.0.5/rpmrc.in	Sun Jul 30 00:03:28 2000
-@@ -120,10 +120,10 @@
- 
- buildarchtranslate: ia64: ia64
+diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
+--- rpm.org/rpmrc.in	2004-06-14 11:41:06.654241680 +0200
++++ rpm/rpmrc.in	2004-06-14 11:42:26.617085480 +0200
+@@ -186,12 +186,12 @@
+ buildarchtranslate: osfmach3_i486: i386
+ buildarchtranslate: osfmach3_i386: i386
  
 -buildarchtranslate: athlon: i386
+-buildarchtranslate: pentium4: i386
+-buildarchtranslate: pentium3: i386
 -buildarchtranslate: i686: i386
 -buildarchtranslate: i586: i386
 -buildarchtranslate: i486: i386
 +buildarchtranslate: athlon: athlon
++buildarchtranslate: pentium4: pentium4
++buildarchtranslate: pentium3: pentium3
 +buildarchtranslate: i686: i686
 +buildarchtranslate: i586: i586
 +buildarchtranslate: i486: i486
  buildarchtranslate: i386: i386
  
- buildarchtranslate: osfmach3_ppc: ppc
-@@ -134,7 +134,8 @@
- buildarchtranslate: sun4d: sparc
+ buildarchtranslate: alphaev5: alpha
+@@ -205,7 +205,8 @@
  buildarchtranslate: sun4m: sparc
+ buildarchtranslate: sparcv8: sparc
  buildarchtranslate: sparcv9: sparc
 -buildarchtranslate: sun4u: sparc64
 +buildarchtranslate: sun4u: sparc
 +buildarchtranslate: sparc64: sparc
  
- buildarchtranslate: atarist: m68kmint
- buildarchtranslate: atariste: m68kmint
+ buildarchtranslate: osfmach3_ppc: ppc
+ buildarchtranslate: powerpc: ppc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-arch.patch?r1=1.5&r2=1.5.4.1&f=u