From 88a0aaa42a25633714fbf4c4ef1269d8d51b9a5d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 1 Aug 2024 10:39:44 +0300 Subject: [PATCH] - Update patch to detect ExclusiveArch --- ..._v2-as-x86_64-in-architecture-checks.patch | 22 ++++++++++++++++--- SPECS/rpm.spec | 5 ++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/SOURCES/0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch b/SOURCES/0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch index f85d6a5..74308b3 100644 --- a/SOURCES/0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch +++ b/SOURCES/0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch @@ -1,13 +1,29 @@ -From 86efc664f71721cb2fb1ec512f29b36876f86baa Mon Sep 17 00:00:00 2001 +From 834feed695b5cb5ea27aaa23936eaeda2372b56b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 9 Jul 2024 17:03:27 +0300 Subject: [PATCH] Fix: Treat x86_64_v2 as x86_64 in architecture checks This change allows spec files to use x86_64_v2 as an alias for x86_64, ensuring compatibility with packages and build scripts expecting x86_64. --- - build/parseSpec.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) + build/parsePreamble.c | 4 ++++ + build/parseSpec.c | 17 +++++++++++++++++ + 2 files changed, 21 insertions(+) +diff --git a/build/parsePreamble.c b/build/parsePreamble.c +index de205d5..a8f3b47 100644 +--- a/build/parsePreamble.c ++++ b/build/parsePreamble.c +@@ -425,6 +425,10 @@ static int isMemberInEntry(Header h, const char *name, rpmTagVal tag) + return -1; + + while ((str = rpmtdNextString(&td))) { ++ if (!rstrcasecmp(str, "x86_64") && !rstrcasecmp(name, "x86_64_v2")) { ++ found = 1; ++ break; ++ } + if (!rstrcasecmp(str, name)) { + found = 1; + break; diff --git a/build/parseSpec.c b/build/parseSpec.c index d6e998a..102ce5b 100644 --- a/build/parseSpec.c diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index 9c4f25e..1f75263 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -36,7 +36,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}%{baserelease}%{?dist}.alma.1 +Release: %{?snapver:0.%{snapver}.}%{baserelease}%{?dist}.alma.2 Url: http://www.rpm.org/ License: GPL-2.0-or-later Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2 @@ -618,6 +618,9 @@ fi %doc %{_defaultdocdir}/rpm/API/ %changelog +* Thu Aug 01 2024 Eduard Abdullin - 4.19.1.1-2.alma.2 +- Update patch to detect ExclusiveArch + * Tue Jul 09 2024 Eduard Abdullin - 4.19.1.1-2.alma.1 - Fix: Treat x86_64_v2 as x86_64 in architecture checks