From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 27 Oct 2020 21:39:53 +0000 (+0100)
Subject: - don't translate every ix86 arch into i386
X-Git-Tag: auto/th/rpm-4.16.1.2-1~33
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=cd96ac18b458579a29951bac29fdfa9c0bcb45a5

- don't translate every ix86 arch into i386
---

diff --git a/ix86-platforms.patch b/ix86-platforms.patch
index 5d9f4c8..9f862e6 100644
--- a/ix86-platforms.patch
+++ b/ix86-platforms.patch
@@ -9,3 +9,26 @@
  	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
++buildarchtranslate: i586: i586
++buildarchtranslate: i486: i486
+ buildarchtranslate: i386: i386
+ 
+ buildarchtranslate: alphaev5: alpha
diff --git a/rpm.spec b/rpm.spec
index d98dbac..16f66cd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.16.0
-Release:	0.3
+Release:	0.4
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base