Add support for versioned x86_64 arches

SOURCES/shim.rpmmacros

@@ -3,8 +3,6 @@
 %global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
 %global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
 
-%global grub_version 2.06-27.el9_0.12
-
 %global bootcsvaa64 %{expand:%{SOURCE10}}
 %global bootcsvx64 %{expand:%{SOURCE12}}
 #%%global bootcsvarm %%{expand:%%{SOURCE13}}
@@ -57,12 +55,6 @@ Requires: mokutil >= 1:0.3.0-1						\
 Requires: efi-filesystem						\
 Provides: shim-signed-%{-a*} = %{version}-%{release}			\
 Requires: dbxtool >= 0.6-3						\
-%{expand:%ifarch x86_64						\
-# SecureBoot keys dependencies						\
-Requires: almalinux(grub2-sig-key) >= 202303				\
-Requires: almalinux(kernel-sig-key) >= 202303				\
-%endif}				\
-Conflicts: grub2-efi-%{-a*} < %{grub_version}				\
 %{expand:%%if 0%%{-p*}							\
 Provides: shim = %{version}-%{release}					\
 Provides: shim-signed = %{version}-%{release}				\
@@ -183,7 +175,7 @@ install -m 0700 fb%{-a*}.efi						\\\
 %%verify(not mtime) %{efi_esp_boot}/*%{-A*}.EFI				\
 %{nil}
 
-%ifarch x86_64
+%ifarch %{x86_64}
 %global is_signed yes
 %global is_alt_signed no
 %global provide_legacy_shim 1
@@ -193,7 +185,7 @@ install -m 0700 fb%{-a*}.efi						\\\
 %global is_alt_signed no
 %global provide_legacy_shim 1
 %endif
-%ifnarch x86_64 aarch64
+%ifnarch %{x86_64} aarch64
 %global is_signed no
 %global is_alt_signed no
 %global provide_legacy_shim 0

SPECS/shim.spec

@@ -11,7 +11,7 @@ URL:		https://github.com/rhboot/shim/
 BuildRequires:	efi-filesystem
 BuildRequires:	efi-srpm-macros >= 6
 
-ExclusiveArch:	%{efi} x86_64_v2
+ExclusiveArch:	%{efi} %{x86_64}
 # and we don't have shim-unsigned-arm builds *yet*
 ExcludeArch:	%{arm} %{ix86}