bring back explicit lib64 for x86_64; rel 3

- leave original condition on CANONCOLOR=3 making aarch64 patch obsolete

diff --git a/aarch64.patch b/aarch64.patch
deleted file mode 100644 (file)
index 8013c2a..0000000
--- a/aarch64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- rpm-4.16.0/installplatform.orig    2020-10-24 21:48:07.586493242 +0200
-+++ rpm-4.16.0/installplatform 2020-10-24 21:48:23.069703643 +0200
-@@ -207,6 +207,10 @@
-       LIB=${LIB}x32
-   fi
- 
-+  if [ "$OS" = "linux" ] && [ "$CANONARCH" = "aarch64" ]; then
-+      LIB=${LIB}64
-+  fi
-+
-   PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
-   [ -d $PPD ] || mkdir -p $PPD
- 

diff --git a/rpm.spec b/rpm.spec
index fab411e74ec855a4c99d2ab8172198c805659cd4..b102e89ebb2e1366d56719fd291dd3cb58bd1711 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.16.1.3
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL v2 / LGPL v2.1
 Group:         Base
@@ -76,7 +76,6 @@ Patch17:      python-internal-build.patch
 Patch18:       missing-macros.patch
 Patch19:       pkgconfig.patch
 Patch20:       uname-deps.patch
-Patch21:       aarch64.patch
 Patch22:       ix86-platforms.patch
 Patch23:       shortcircuited-deps.patch
 Patch24:       cpuinfo-deps.patch
@@ -613,7 +612,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1

diff --git a/x32.patch b/x32.patch
index a97fdb785d9a18148159ce0fe7836288578cbeb1..75e134db3f8c53ef0c95c6cd6211422ee301017f 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -105,7 +105,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
  
    # XXX FIXME: incomplete and quite likely wrong too in places,
    # consult various arch folks for correct names etc.
-@@ -75,7 +77,15 @@
+@@ -82,7 +84,15 @@
        ISANAME=x86
        ISABITS=64
        CANONARCH=x86_64
@@ -122,7 +122,12 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
        ;;
      ia64)
        ISANAME=ia
-@@ -190,6 +201,10 @@
+@@ -190,10 +200,14 @@
+   # skip architectures for which we dont have full config parameters
+   [ -z "$CANONARCH" ] && continue
+ 
+-  if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
++  if [ "$OS" = "linux" ] && ( [ "$CANONCOLOR" = 3 ] || [ "$CANONARCH" = "x86_64" ] ); then
        LIB=${LIB}64
    fi
  
@@ -133,7 +138,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
    PPD="${DESTDIR}/${platformdir}/${ARCH}-${OS}"
    [ -d $PPD ] || mkdir -p $PPD
  
-@@ -202,6 +221,8 @@
+@@ -202,6 +216,8 @@
        -e "s,@RPMCANONARCH@,$CANONARCH,g" \
        -e "s,@RPMCANONCOLOR@,$CANONCOLOR," \
        -e "s,@RPMRC_GNU@,$RPMRC_GNU," \