From 74e692706d868e7a54aeff73616c18421f3ef4e7 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 4 May 2018 10:30:18 -0400
Subject: [PATCH] still working on this...

---
 shim.rpmmacros | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/shim.rpmmacros b/shim.rpmmacros
index 0747e6f..c9c9764 100644
--- a/shim.rpmmacros
+++ b/shim.rpmmacros
@@ -23,21 +23,23 @@
 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
 
-%{expand:
-%%global bootcsv %%{expand:%%{bootcsv%%{efi_arch}}}
-%%global bootcsvalt %%{expand:%%{bootcsv%%{?efi_alt_arch}}}
-%%global shimefi %%{expand:%%{shimefi%%{efi_arch}}}
-%%global shimefialt %%{expand:%%{shimefi%%{?efi_alt_arch}}}
-%%global shimver %%{expand:%%{shimver%%{efi_arch}}}
-%%global shimveralt %%{expand:%%{shimver%%{?efi_alt_arch}}}
-%%global shimdir %%{expand:%%{shimdir%%{efi_arch}}}
-%%global shimdiralt %%{expand:%%{shimdir%%{?efi_alt_arch}}}
+%global bootcsv %{expand:%{bootcsv%{efi_arch}}}
+%global bootcsvalt %{expand:%{bootcsv%{?efi_alt_arch}}}
+%global shimefi %{expand:%{shimefi%{efi_arch}}}
+%global shimefialt %{expand:%{shimefi%{?efi_alt_arch}}}
+%global shimver %{expand:%{shimver%{efi_arch}}}
+%global shimveralt %{expand:%{shimver%{?efi_alt_arch}}}
+%global shimdir %{expand:%{shimdir%{efi_arch}}}
+%global shimdiralt %{expand:%{shimdir%{?efi_alt_arch}}}
 
-%%global unsigned%{efi_arch} %{efi_arch}
-%%global unsignedaa64 aarch64
-%%global unsigned shim-unsigned-%%{expand:%%{unsigned%{efi_arch}}}
-%%global unsignedalt shim-unsigned-%{?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}
 
 %define define_pkg(a:p:)						\
 %{expand:%%package -n shim-%{-a*}}					\
@@ -161,10 +163,8 @@ install -m 0700 fb%{-a*}.efi						\\\
 %global provide_legacy_shim 0
 %endif
 
-%global found_macros_dot_shim 1
-
 %if ! 0%{?vendor:1}
 %global vendor nopenopenope
 %endif
 
-# filetype:spec
+# vim:filetype=spec