rpms/rpm
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix: Treat x86_64_v2 as x86_64 in architecture checks

Browse Source
This commit is contained in:
Eduard Abdullin 2025-02-12 10:35:24 +03:00 committed by eabdullin
commit 36166ab1f3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpm.spec
View File

@ -27,7 +27,7 @@
%global rpmver 4.19.1.1 %global rpmver 4.19.1.1
#global snapver rc1 #global snapver rc1
%global baserelease 11 %global baserelease 12
%global sover 10 %global sover 10
%global srcver %{rpmver}%{?snapver:-%{snapver}} %global srcver %{rpmver}%{?snapver:-%{snapver}}
@ -48,6 +48,9 @@ Source21: rpmdb_migrate
Source30: macros.rpmsign-sequoia Source30: macros.rpmsign-sequoia
# AlmaLinux Patch
Patch1: 0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch
Requires: coreutils Requires: coreutils
Requires: popt%{_isa} >= 1.10.2.1 Requires: popt%{_isa} >= 1.10.2.1
Requires: curl Requires: curl
@ -126,9 +129,6 @@ Requires(pre): findutils
Requires(pre): sed Requires(pre): sed
%patchlist %patchlist
# AlmaLinux specific patches
0001-Fix-Treat-x86_64_v2-as-x86_64-in-architecture-checks.patch
# Set rpmdb path to /usr/lib/sysimage/rpm # Set rpmdb path to /usr/lib/sysimage/rpm
rpm-4.17.x-rpm_dbpath.patch rpm-4.17.x-rpm_dbpath.patch
# Disable autoconf config.site processing (#962837) # Disable autoconf config.site processing (#962837)
@ -638,9 +638,12 @@ fi
%doc %{_defaultdocdir}/rpm/API/ %doc %{_defaultdocdir}/rpm/API/
%changelog %changelog
* Wed Feb 12 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.19.1.1-11.alma.1 * Wed Feb 12 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.19.1.1-12.alma.1
- Fix: Treat x86_64_v2 as x86_64 in architecture checks - Fix: Treat x86_64_v2 as x86_64 in architecture checks
* Fri Feb 07 2025 Michal Domonkos <mdomonko@redhat.com> - 4.19.1.1-12
- Rebuild for ima-evm-utils 1.6 soname bump (RHEL-65378)
* Fri Jan 24 2025 Michal Domonkos <mdomonko@redhat.com> - 4.19.1.1-11 * Fri Jan 24 2025 Michal Domonkos <mdomonko@redhat.com> - 4.19.1.1-11
- Fix possible package corruption on --delsign/resign/addsign (RHEL-69518) - Fix possible package corruption on --delsign/resign/addsign (RHEL-69518)
- Fix regression on build-id generation from compressed ELF (RHEL-54000) - Fix regression on build-id generation from compressed ELF (RHEL-54000)
@ -1401,3 +1404,4 @@ fi
* Thu Aug 10 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.90-0.git14000.1 * Thu Aug 10 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.90-0.git14000.1
- Rebase to rpm 4.13.90 aka 4.14.0-alpha (#1474836) - Rebase to rpm 4.13.90 aka 4.14.0-alpha (#1474836)