[packages/rpm] - check for exclude/exclusive arch before building, rel 9

[baggins]

commit b3ccd15bc27c190cb52cb460698c33d181e16449
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 12 23:18:45 2025 +0100

    - check for exclude/exclusive arch before building, rel 9
    
    Restore changes made in upstream commit
    https://github.com/rpm-software-management/rpm/commit/fd32a43e04814bd1f298977306ac1bcdc6c790d2
    that moved checkForValidArchitectures() out of parsePreamble() and into finalizeSpec()
    which is only called _after successful %install_.

 check-valid-arch-early.patch | 13 +++++++++++++
 rpm.spec                     |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 84e484c..9652ead 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.20.0
-Release:	8
+Release:	9
 Epoch:		1
 License:	GPL v2 / LGPL v2.1
 Group:		Base
@@ -86,6 +86,7 @@ Patch27:	noexpand.patch
 Patch28:	skip-symlinks.patch
 Patch29:	build-locale.patch
 Patch30:	no-exe-for-elf-req.patch
+Patch31:	check-valid-arch-early.patch
 URL:		https://rpm.org/
 BuildRequires:	acl-devel
 %{?with_audit:BuildRequires:	audit-libs-devel}
@@ -650,6 +651,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch -P 28 -p1
 %patch -P 29 -p1
 %patch -P 30 -p1
+%patch -P 31 -p1
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE5}
diff --git a/check-valid-arch-early.patch b/check-valid-arch-early.patch
new file mode 100644
index 0000000..f8241be
--- /dev/null
+++ b/check-valid-arch-early.patch
@@ -0,0 +1,13 @@
+--- rpm-4.20.0/build/parsePreamble.c~	2024-10-07 11:35:46.000000000 +0200
++++ rpm-4.20.0/build/parsePreamble.c	2025-02-12 23:12:25.436660137 +0100
+@@ -1330,6 +1330,10 @@
+ 	rpmPushMacroFlags(spec->macros, "_buildrootdir", NULL,
+ 			    "%{dirname:%{buildroot}}", RMIL_GLOBAL, 0);
+     }
++    /* XXX Skip valid arch check if not building binary package */
++    if (!(spec->flags & RPMSPEC_ANYARCH) && checkForValidArchitectures(spec)) {
++	goto exit;
++    }
+ 
+     /* if we get down here nextPart has been set to non-error */
+     res = nextPart;
================================================================

---- gitweb:

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