From c7c43ad2c86964976ac5c23aa60e0ca6f61a12e4 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Thu, 8 Aug 2024 21:21:58 +0000
Subject: [PATCH] Add versioned x86_64 arches support

---
 ...-Add-versioned-x86_64-arches-support.patch | 25 +++++++++++++++++++
 pesign.patches                                |  1 +
 pesign.spec                                   |  5 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 0003-Add-versioned-x86_64-arches-support.patch

diff --git a/0003-Add-versioned-x86_64-arches-support.patch b/0003-Add-versioned-x86_64-arches-support.patch
new file mode 100644
index 0000000..78401cc
--- /dev/null
+++ b/0003-Add-versioned-x86_64-arches-support.patch
@@ -0,0 +1,25 @@
+From e41a36c966e56fd82a9782551765b1fe8f198272 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <alukoshko@almalinux.org>
+Date: Thu, 8 Aug 2024 21:15:58 +0000
+Subject: [PATCH] Add versioned x86_64 arches support
+
+---
+ src/pesign-rpmbuild-helper.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pesign-rpmbuild-helper.in b/src/pesign-rpmbuild-helper.in
+index 9dee56e..51234db 100644
+--- a/src/pesign-rpmbuild-helper.in
++++ b/src/pesign-rpmbuild-helper.in
+@@ -144,7 +144,7 @@ main() {
+     fi
+ 
+     target_cpu="${target_cpu/i?86/ia32}"
+-    target_cpu="${target_cpu/x86_64/x64}"
++    target_cpu="${target_cpu/x86_64*/x64}"
+     target_cpu="${target_cpu/aarch64/aa64}"
+     target_cpu="${target_cpu/arm*/arm/}"
+ 
+-- 
+2.43.5
+
diff --git a/pesign.patches b/pesign.patches
index fa7478f..0a9b439 100644
--- a/pesign.patches
+++ b/pesign.patches
@@ -1,2 +1,3 @@
 Patch0001: 0001-cms_common-Fixed-Segmentation-fault.patch
 Patch0002: 0002-Fix-reversed-calloc-arguments.patch
+Patch0003: 0003-Add-versioned-x86_64-arches-support.patch
diff --git a/pesign.spec b/pesign.spec
index 871debc..f5d51c8 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -6,7 +6,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 116
-Release: 5%{?dist}
+Release: 5%{?dist}.alma.1
 License: GPL-2.0-only
 URL:     https://github.com/rhboot/pesign
 
@@ -162,6 +162,9 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
+* Thu Aug 08 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 116-5.alma.1
+- Add versioned x86_64 arches support
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
 - Bump release for June 2024 mass rebuild