From df847f2a382bb244cc14c8192b19b7c0608820c1 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Dec 09 2020 12:50:33 +0000
Subject: Prepare for a new update


Reverting patches so we can apply the latest update
and changes can be seen in the spec file and sources.

---

diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
index f3b4c68..5f8a784 100644
--- a/macros.efi-srpm.in
+++ b/macros.efi-srpm.in
@@ -38,7 +38,7 @@
     elseif arch("%{arm}") then
       return("arm")
     else
-      return("none")
+      return("")
     end
   end
   -- alt arch
@@ -46,30 +46,24 @@
     if arch("x86_64") then
       return("ia32")
     else
-      return("none")
+      return(nil)
     end
   end
   -- make some macros
   local done = rpm.expand("%{?_efi}")
   if done == nil or done == "" then
-    local arch = getarch()
     local alt = getaltarch()
     print("%global _efi @@EFI_ARCHES@@\\n")
     print("%global _efi_vendor @@EFI_VENDOR@@\\n")
-    if arch == "none" then
-      print("%global _efi_has_arch 0\\n")
-    else
-      print("%global _efi_has_arch 1\\n")
-    end
     print("%global _efi_arch " .. getarch() .. "\\n")
     print("%global _efi_arch_upper " .. string.upper(getarch()) .. "\\n")
-    if alt == "none" then
+    if alt == nil then
       print("%global _efi_has_alt_arch 0\\n")
     else
       print("%global _efi_has_alt_arch 1\\n")
+      print("%global _efi_alt_arch " .. alt .. "\\n")
+      print("%global _efi_alt_arch_upper " .. string.upper(alt) .. "\\n")
     end
-    print("%global _efi_alt_arch " .. alt .. "\\n")
-    print("%global _efi_alt_arch_upper " .. string.upper(alt) .. "\\n")
   end
 }}
 
@@ -85,7 +79,6 @@
 
 %efi_arch %{expand:%{_efi_srpm_macros_setup}}%{_efi_arch}
 %efi_arch_upper %{expand:%{_efi_srpm_macros_setup}}%{_efi_arch_upper}
-%efi_has_arch %{expand:%{_efi_srpm_macros_setup}}0%{_efi_has_arch}
 %efi_has_alt_arch %{expand:%{_efi_srpm_macros_setup}}0%{_efi_has_alt_arch}
 %efi_alt_arch %{expand:%{_efi_srpm_macros_setup}}%{?_efi_alt_arch}%{nil}
 %efi_alt_arch_upper %{expand:%{_efi_srpm_macros_setup}}%{?_efi_alt_arch_upper}%{nil}