- rpm.org RPM, merged from PLD

[packages/rpm.git] / ix86-platforms.patch

diff --git a/rpm-arch.patch b/ix86-platforms.patch
similarity index 52%
rename from rpm-arch.patch
rename to ix86-platforms.patch
index e185db6ea1543db8b82daff9beace8cee39226ca..9f862e6a7dc8afeb0f2880fa49a12de0f52cd195 100644 (file)
--- a/rpm-arch.patch
+++ b/ix86-platforms.patch
@@ -1,17 +1,29 @@
-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 @@
+--- rpm-4.16.0/installplatform.orig    2020-10-27 00:28:54.592595565 +0100
++++ rpm-4.16.0/installplatform 2020-10-27 00:31:27.676694730 +0100
+@@ -76,7 +76,7 @@
+     i?86|pentium?|athlon|geode)
+       ISANAME=x86
+       ISABITS=32
+-      CANONARCH=i386
++      CANONARCH=${ARCH}
+       CANONCOLOR=0
+       ;;
+     x86_64|amd64|ia32e)
+--- rpm-4.16.0/rpmrc.in~       2020-10-27 22:14:37.000000000 +0100
++++ rpm-4.16.0/rpmrc.in        2020-10-27 22:37:49.273277848 +0100
+@@ -302,13 +302,13 @@
  buildarchtranslate: osfmach3_i486: i386
  buildarchtranslate: osfmach3_i386: i386
  
 -buildarchtranslate: athlon: i386
+-buildarchtranslate: geode: i386
 -buildarchtranslate: pentium4: i386
 -buildarchtranslate: pentium3: i386
 -buildarchtranslate: i686: i386
 -buildarchtranslate: i586: i386
 -buildarchtranslate: i486: i386
 +buildarchtranslate: athlon: athlon
++buildarchtranslate: geode: geode
 +buildarchtranslate: pentium4: pentium4
 +buildarchtranslate: pentium3: pentium3
 +buildarchtranslate: i686: i686
@@ -20,14 +32,3 @@ diff -urN rpm.org/rpmrc.in rpm/rpmrc.in
  buildarchtranslate: i386: i386
  
  buildarchtranslate: alphaev5: alpha
-@@ -206,8 +206,9 @@
- buildarchtranslate: sun4d: sparc
- buildarchtranslate: sun4m: sparc
- buildarchtranslate: sparcv8: sparc
--buildarchtranslate: sparcv9: sparc
-+buildarchtranslate: sparcv9: sparcv9
- buildarchtranslate: sun4u: sparc64
-+buildarchtranslate: sparc64: sparc64
- 
- buildarchtranslate: osfmach3_ppc: ppc
- buildarchtranslate: powerpc: ppc