[rpms/grub2] rawhide: Fix %grub_efi_dir in ELN

[rpms/grub2] rawhide: Fix %grub_efi_dir in ELN

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/grub2
            Branch : rawhide
            Commit : 0ffa4069f26bfc5ef0c5f96ee07f708919ae3c53
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-07-27T15:00:05-04:00
            Stats  : +5/-3 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/grub2/c/0ffa4069f26bfc5ef0c5f96ee07f708919ae3c53?branch=rawhide

            Log:
            Fix %grub_efi_dir in ELN

Use %efi_vendor here too for consistency; this should fix bootupd on ELN
now that it identifies as itself rather than a variant of Fedora (which is
still the vendor, but not the OS ID).

https://github.com/fedora-eln/eln/issues/469
https://src.fedoraproject.org/rpms/efi-rpm-macros/c/509fcdd64aed0280b08f19e7566f96e8e1e7ff21

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

---
diff --git a/grub.macros b/grub.macros
index 15fd284..e6d8c0e 100644
--- a/grub.macros
+++ b/grub.macros
@@ -3,9 +3,8 @@
 %global evr %{epoch}:%{version}-%{release}
 %global _libdir %{_exec_prefix}/lib
 
-%global os_id %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
 %global grub_evr_dir %{_libdir}/efi/grub2/%{evr}
-%global grub_efi_dir %{grub_evr_dir}/EFI/%{os_id}
+%global grub_efi_dir %{grub_evr_dir}/EFI/%{efi_vendor}
 
 %global _binaries_in_noarch_packages_terminate_build 0
 #%%undefine _missing_build_ids_terminate_build

diff --git a/grub2.spec b/grub2.spec
index 9795f19..b00f8e1 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	71%{?dist}
+Release:	72%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -694,6 +694,9 @@ fi
 %endif
 
 %changelog
+* Mon Jul 27 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 2.12-72
+- Fix %%grub_efi_dir in ELN
+
 * Mon Jul 20 2026 Josue Hernandez <josherna@redhat.com> - 2.12-71
 - Remove creation of /boot/loader/entries