Make sure all of our macros always expand

Signed-off-by: Peter Jones <pjones@redhat.com>

shim.rpmmacros

@@ -23,6 +23,11 @@
 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
 
+%global unsignedaa64 shim-unsigned-aarch64
+%global unsignedia32 shim-unsigned-ia32
+%global unsignedx64 shim-unsigned-x64
+#%%global unsignedarm shim-unsigned-arm
+
 %global bootcsv %{expand:%{bootcsv%{efi_arch}}}
 %global bootcsvalt %{expand:%{bootcsv%{?efi_alt_arch}}}
 %global shimefi %{expand:%{shimefi%{efi_arch}}}
@@ -32,14 +37,9 @@
 %global shimdir %{expand:%{shimdir%{efi_arch}}}
 %global shimdiralt %{expand:%{shimdir%{?efi_alt_arch}}}
 
-%ifarch aarch64
-%global unsignedarch aarch64
-%else
-%global unsignedarch %{efi_arch}
-%endif
-%global unsignedarchalt %{?efi_alt_arch}%{nil}
-%global unsigned shim-unsigned-%{?unsignedarch}%{nil}
-%global unsignedalt shim-unsigned-%{?unsignedarchalt}%{nil}
+%global unsignednone shim-unsigned-none
+%global unsigned %{expand:%%{unsigned%{efi_arch}}}
+%global unsignedalt %{expand:%%{unsigned%{efi_alt_arch}}}
 
 %define define_pkg(a:p:)						\
 %{expand:%%package -n shim-%{-a*}}					\

shim.spec

@@ -33,10 +33,21 @@ Source22:	shimx64.efi
 %include %{SOURCE0}
 
 BuildRequires:	pesign >= 0.112-20.fc27
-BuildRequires:	%{unsigned} = %{shimver}
-%if %{efi_has_alt_arch}
-BuildRequires:	%{unsignedalt} = %{shimveralt}
+# We need this because %%{efi} won't expand before choosing where to make
+# the src.rpm in koji, and we could be on a non-efi architecture, in which
+# case we won't have a valid expansion here...  To be solved in the future
+# (shim 16+) by making the unsigned packages all provide "shim-unsigned", so
+# we can just BuildRequires that.
+%ifarch x86_64
+BuildRequires: %{unsignedx64} = %{shimverx64}
+BuildRequires: %{unsignedia32} = %{shimveria32}
 %endif
+%ifarch aarch64
+BuildRequires: %{unsignedaa64} = %{shimveraa64}
+%endif
+#%%ifarch arm
+#BuildRequires: %%{unsignedarm} = %%{shimverarm}
+#%%endif
 
 %description
 Initial UEFI bootloader that handles chaining to a trusted full bootloader