- platform fixes

- don't translate all ix86 to i386
- fix x32 color
- it should be safe to always apply aarch64 platform fix

diff --git a/ix86-platforms.patch b/ix86-platforms.patch
new file mode 100644 (file)
index 0000000..5d9f4c8
--- /dev/null
+++ b/ix86-platforms.patch
@@ -0,0 +1,11 @@
+--- 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)

diff --git a/rpm.spec b/rpm.spec
index 5867562497c2ec359a623b9edeb110bfd6367741..c41eff45830ef4222a1b0c125e12e6758751b7d1 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.1
+Release:       0.2
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -73,6 +73,7 @@ Patch18:      rpmversion.patch
 Patch19:       pkgconfig.patch
 Patch20:       uname-deps.patch
 Patch21:       aarch64.patch
+Patch22:       ix86-platforms.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
@@ -559,9 +560,8 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%ifarch aarch64
 %patch21 -p1
-%endif
+%patch22 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 

diff --git a/x32.patch b/x32.patch
index bef950e816af58b0a78427646df51d2aeeb1e1ba..5be418e40fb32fc91a94f06c8490404460a934d7 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -64,13 +64,14 @@ diff -ur rpm-4.15.1.orig/installplatform rpm-4.15.1/installplatform
        ISANAME=x86
        ISABITS=64
        CANONARCH=x86_64
+-      CANONCOLOR=3
 +      CANONCOLOR=7
 +      ;;
 +    x32)
 +      ISANAME=x86
 +      ISABITS=32
 +      CANONARCH=x32
-       CANONCOLOR=3
++      CANONCOLOR=4
 +      FORCE_RPMRC_GNU="${RPMRC_GNU}x32"
 +      TARGETCPU="x86_64"
        ;;