[shim-signed] Make multi-arch bits actually work maybe.

[Peter Jones]

commit 7ca108930c4be814e0754ab3a7d452bf073a40d5
Author: Peter Jones <pjones at redhat.com>
Date:   Fri Oct 24 18:25:51 2014 -0400

    Make multi-arch bits actually work maybe.
    
    Signed-off-by: Peter Jones <pjones at redhat.com>

 shim-signed.spec |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/shim-signed.spec b/shim-signed.spec
index 2fda94e..0941566 100644
--- a/shim-signed.spec
+++ b/shim-signed.spec
@@ -1,10 +1,3 @@
-%ifarch x86_64
-%global efiarch x64
-%endif
-%ifarch aarch64
-%global efiarch aa64
-%endif
-
 Name:           shim-signed
 Version:        0.8
 Release:        1%{?dist}
@@ -14,8 +7,19 @@ Provides:	shim = %{version}-%{release}
 
 License:        BSD
 URL:            http://www.codon.org.uk/~mjg59/shim/
-Source0:	shim%{efiarch}.efi
-Source1:	BOOT.CSV
+Source0:	BOOT.CSV
+%ifarch x86_64
+%global efiarch X64
+Source1:	shimx64.efi
+%global shimsrc %{SOURCE1}
+%endif
+%ifarch aarch64
+%global efiarch AA64
+Source2:	shimaa64.efi
+%global shimsrc %{SOURCE2}
+%endif
+
+
 
 BuildRequires: shim-unsigned = %{unsignedver}
 BuildRequires: pesign >= 0.100-1%{dist}
@@ -71,12 +75,12 @@ mkdir shim-signed-%{version}
 
 cd shim-signed-%{version}
 %ifarch %{ca_signed_arches}
-pesign -i %{SOURCE0} -h -P > shim.hash
+pesign -i %{shimsrc} -h -P > shim.hash
 if ! cmp shim.hash %{_datadir}/shim/shim.hash ; then
 	echo Invalid signature\! > /dev/stderr
 	exit 1
 fi
-cp %{SOURCE0} shim.efi
+cp %{shimsrc} shim.efi
 %endif
 %ifarch %{rh_signed_arches}
 %pesign -s -i shim.efi -o shim-%{efidir}.efi
@@ -97,10 +101,10 @@ install -D -d -m 0755 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 install -m 0644 shim.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
 install -m 0644 shim-%{efidir}.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim-%{efidir}.efi
 install -m 0644 MokManager.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
+install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
 
 install -D -d -m 0755 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
-install -m 0644 shim.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOTX64.EFI
+install -m 0644 shim.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{efiarch}.EFI
 install -m 0644 fallback.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
 
 %files -n shim
@@ -108,7 +112,7 @@ install -m 0644 fallback.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
 /boot/efi/EFI/%{efidir}/shim-%{efidir}.efi
 /boot/efi/EFI/%{efidir}/MokManager.efi
 /boot/efi/EFI/%{efidir}/BOOT.CSV
-/boot/efi/EFI/BOOT/BOOTX64.EFI
+/boot/efi/EFI/BOOT/BOOT%{efiarch}.EFI
 /boot/efi/EFI/BOOT/fallback.efi
 
 %changelog