diff --git a/SOURCES/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch b/SOURCES/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch new file mode 100644 index 0000000..64a9e43 --- /dev/null +++ b/SOURCES/0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch @@ -0,0 +1,42 @@ +From d63dfdba8f97ea42e1e3661de6bbaf273ccb790a Mon Sep 17 00:00:00 2001 +From: eabdullin +Date: Wed, 10 Jul 2024 15:36:47 +0300 +Subject: [PATCH] Set x86_64 arch as exchangeable to x86_64_v2 + +--- + src/poolarch.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/poolarch.c b/src/poolarch.c +index bc4582f..3b5a893 100644 +--- a/src/poolarch.c ++++ b/src/poolarch.c +@@ -24,13 +24,13 @@ static const char *archpolicies[] = { + #if defined(FEDORA) || defined(MAGEIA) + "x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386", + "x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:athlon:i686:i586:i486:i386", +- "x86_64_v2", "x86_64_v2:x86_64:athlon:i686:i586:i486:i386", +- "x86_64", "x86_64:athlon:i686:i586:i486:i386", ++ "x86_64_v2", "x86_64_v2=x86_64:athlon:i686:i586:i486:i386", ++ "x86_64", "x86_64=x86_64_v2:athlon:i686:i586:i486:i386", + #else + "x86_64_v4", "x86_64_v4:x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386", + "x86_64_v3", "x86_64_v3:x86_64_v2:x86_64:i686:i586:i486:i386", +- "x86_64_v2", "x86_64_v2:x86_64:i686:i586:i486:i386", +- "x86_64", "x86_64:i686:i586:i486:i386", ++ "x86_64_v2", "x86_64_v2=x86_64:i686:i586:i486:i386", ++ "x86_64", "x86_64=x86_64_v2:i686:i586:i486:i386", + #endif + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", +@@ -70,6 +70,7 @@ static const char *archpolicies[] = { + 0 + }; + ++ + void + pool_setarch(Pool *pool, const char *arch) + { +-- +2.39.3 (Apple Git-146) + diff --git a/SPECS/libsolv.spec b/SPECS/libsolv.spec index 94f2fb9..4eb34b5 100644 --- a/SPECS/libsolv.spec +++ b/SPECS/libsolv.spec @@ -37,7 +37,7 @@ Name: lib%{libname} Version: 0.7.29 -Release: %autorelease +Release: %{autorelease}.alma.1 Summary: Package dependency solver License: BSD-3-Clause @@ -46,6 +46,9 @@ Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # Downstream-only, RHEL-41048 Patch0: 0001-Add-support-for-computing-hashes-using-OpenSSL.patch +# AlmaLinux patches +Patch1000: 0001-Set-x86_64-arch-as-exchangeable-to-x86_64_v2.patch + BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build @@ -284,6 +287,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %endif %changelog +* Wed Jul 10 2024 Eduard Abdullin - 0.7.29-6.alma.1 +- Set x86_64 arch as exchangeable to x86_64_v2 + ## START: Generated by rpmautospec * Tue Jul 09 2024 Petr Písař - 0.7.29-6 - Use digest functions from OpenSSL