[packages/rpm] - update x32 patch to accommodate for cmake hardcoding shenanigans

[baggins]

commit 2ae8d9ee4dc8885ec74f6e87426280e9c447fff2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 25 19:12:22 2024 +0100

    - update x32 patch to accommodate for cmake hardcoding shenanigans

 rpm.spec  |  2 +-
 x32.patch | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 175b7f1..351dd31 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -696,7 +696,7 @@ install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
 
-%{__make} -C build install \
+%{__make} -C build-cmake install \
 	pkgconfigdir=%{_pkgconfigdir} \
 	DESTDIR=$RPM_BUILD_ROOT
 
diff --git a/x32.patch b/x32.patch
index 9aad864..3091a58 100644
--- a/x32.patch
+++ b/x32.patch
@@ -47,20 +47,6 @@ diff -ur rpm-4.16.1.2/include/rpm/rpmfc.h rpm-4.16.1.2.x32/include/rpm/rpmfc.h
  	/*!< (1 << 3) leaks into package headers, reserved */
  
      RPMFC_WHITE			= (1 << 29),
-#diff -ur rpm-4.16.1.2/configure.ac rpm-4.16.1.2.x32/configure.ac
-#--- rpm-4.16.1.2/configure.ac	2021-03-21 21:51:28.221530479 +0100
-#+++ rpm-4.16.1.2.x32/configure.ac	2021-03-21 21:50:04.127398387 +0100
-#@@ -930,6 +930,10 @@
-# if echo "$host_os" | grep '.*-gnu$' > /dev/null ; then
-# 	host_os=`echo "${host_os}" | sed 's/-gnu$//'`
-# fi
-#+if echo "$host_os" | grep '.*-gnux32' > /dev/null ; then
-#+	host_os=`echo "${host_os}" | sed 's/-gnux32$//'`
-#+	host_os_gnu=-gnux32
-#+fi
-# if echo "$host_os" | grep '.*-gnu[[^-]]*$' > /dev/null ; then
-# 	AC_MSG_ERROR([unrecognized GNU build triplet $host_os])
-# fi
 diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
 --- rpm-4.16.1.2/installplatform	2020-05-28 12:04:25.027136631 +0200
 +++ rpm-4.16.1.2.x32/installplatform	2021-03-21 21:51:47.671145954 +0100
@@ -74,7 +60,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.
-@@ -82,7 +84,16 @@
+@@ -82,7 +84,17 @@
  	ISANAME=x86
  	ISABITS=64
  	CANONARCH=x86_64
@@ -89,6 +75,7 @@ diff -ur rpm-4.16.1.2/installplatform rpm-4.16.1.2.x32/installplatform
 +	APPEND_TARGET_ABI=1
 +	TARGETCPU="x86_64"
 +	PREFERCOLOR=4
++	RPMRC_GNU="-gnux32"
  	;;
      ia64)
  	ISANAME=ia
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/2ae8d9ee4dc8885ec74f6e87426280e9c447fff2