- don't translate every ix86 arch into i386

diff --git a/ix86-platforms.patch b/ix86-platforms.patch
index 5d9f4c827a2a772157eb31930bf2eee1b68cd585..9f862e6a7dc8afeb0f2880fa49a12de0f52cd195 100644 (file)
--- 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 d98dbac6063a4a955b2196041cc86e46f70086fa..16f66cd9c489a75c54f079985dca8988b99e1f91 100644 (file)
--- 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