.gitignore

@@ -1,5 +1,4 @@
 *~
-*.sw?
 *.rpm
 *.tar.*
 .*.sw?

0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch

@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 31 Aug 2021 16:33:07 -0400
-Subject: [PATCH] Don't have arm as an alt arch of aarch64
-
-The compiler isn't actually set up in a way that lets us do this without
-a cross compiler, so we shouldn't do this this way.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- macros.efi-srpm.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/macros.efi-srpm.in b/macros.efi-srpm.in
-index 4d7b019..00503f1 100644
---- a/macros.efi-srpm.in
-+++ b/macros.efi-srpm.in
-@@ -45,8 +45,6 @@
-   local function getaltarch()
-     if arch("x86_64") then
-       return("ia32")
--    elseif arch("aarch64") then
--      return("arm")
-     else
-       return("none")
-     end

efi-rpm-macros.spec

@@ -1,16 +1,13 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
-Version: 5
-Release: 6%{?dist}
+Version: 4
+Release: 3%{?dist}
 License: GPLv3+
 URL: https://github.com/rhboot/%{name}/
 BuildRequires: git sed
-BuildRequires: make
 BuildArch: noarch
 
-Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-5.tar.bz2
-
-Patch0001: 0001-Don-t-have-arm-as-an-alt-arch-of-aarch64.patch
+Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-4.tar.bz2
 
 %global debug_package %{nil}
 %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
@@ -36,7 +33,7 @@ The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git_am -n %{name}-5
+%autosetup -S git -n %{name}-4
 git config --local --add efi.vendor "%{_efi_vendor_}"
 git config --local --add efi.esp-root /boot/efi
 git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
@@ -68,33 +65,6 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Sep 02 2021 Robbie Harwood <rharwood@redhat.com> - 5-4
-- Remove arm as an alt for aarch64 (would require cross compiler)
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-2
-- There's always a typo.
-
-* Tue Apr 06 2021 Peter Jones <pjones@redhat.com> - 5-1
-- Add arm as an alt for aarch64
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (efi-rpm-macros-5.tar.bz2) = 571d35b76e982bfc3cfbc5d09a871057ac47aa78814262e853ef121e36853886d41b140d79e591976091b8f3b015f85eafa2c881eb468b7d10c1618381013954
+SHA512 (efi-rpm-macros-4.tar.bz2) = 0c580902ec053d3bac167086a70fefd5785ddfd93873a48bb7801ab287b2b7af9db325a1f6e3609ad996656cfff713f741f911d012e89b48250ae108fedb789c