From 0033dd824955efd32ca22ad1d7bde061f397edd6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 27 2022 15:00:02 +0000
Subject: import efi-rpm-macros-6-2.el9_0


---

diff --git a/.efi-rpm-macros.metadata b/.efi-rpm-macros.metadata
index d8a75c0..5bfb0ea 100644
--- a/.efi-rpm-macros.metadata
+++ b/.efi-rpm-macros.metadata
@@ -1 +1 @@
-0c71e8e1736ec1f3d79e0d5757b178c66eed4ccb SOURCES/efi-rpm-macros-4.tar.bz2
+572ed93a939449ed0f2f0cf7dd0ad4739eb2b9d2 SOURCES/efi-rpm-macros-6.tar.bz2
diff --git a/.gitignore b/.gitignore
index ba908cd..599a827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/efi-rpm-macros-4.tar.bz2
+SOURCES/efi-rpm-macros-6.tar.bz2
diff --git a/SPECS/efi-rpm-macros.spec b/SPECS/efi-rpm-macros.spec
index 652d84c..f21c2f1 100644
--- a/SPECS/efi-rpm-macros.spec
+++ b/SPECS/efi-rpm-macros.spec
@@ -1,14 +1,14 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
-Version: 4
-Release: 9%{?dist}
+Version: 6
+Release: 2%{?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}-4.tar.bz2
+Source0: https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-6.tar.bz2
 
 %global debug_package %{nil}
 %global _efi_vendor_ %(eval echo $(sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release))
@@ -34,7 +34,7 @@ The efi-filesystem package contains the basic directory layout for EFI
 machine bootloaders and tools.
 
 %prep
-%autosetup -S git -n %{name}-4
+%autosetup -S git_am -n %{name}-6
 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}"
@@ -66,6 +66,10 @@ git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
 %verify(not mode) %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
+* Thu Apr 14 2022 Peter Jones <pjones@redhat.com> - 6-1
+- Disable ia32 as an alt for x86_64
+  Related: rhbz#1932057
+
 * Mon Nov 08 2021 Robbie Harwood <rharwood@redhat.com> - 4-9
 - Ignore the mode bits when doing RPM verification of files in /boot/efi
 - Resolves: rhbz#1936384