From e1f4c0ec1e8248e0bb5824c1f0252c03ce402cc0 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Sep 20 2017 19:28:42 +0000
Subject: Make grub2-efi-aa64 provide grub2


I'm not sure this is 100% the right place to do this - maybe it should
go in anaconda - but it seems most expedient :/

Resolves: rhbz#1491045

Signed-off-by: Peter Jones <pjones@redhat.com>

---

diff --git a/grub.macros b/grub.macros
index fab76aa..44c6886 100644
--- a/grub.macros
+++ b/grub.macros
@@ -92,6 +92,10 @@
 %global efi_modules " backtrace http linuxefi usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug "
 %endif
 
+%ifarch aarch64
+%global legacy_provides -l
+%endif
+
 %ifarch x86_64
 %global efiarch x64
 %global target_cpu_name %{_arch}
@@ -221,6 +225,7 @@ Requires:	%{name}-tools-minimal >= %{evr}				\
 Requires:	%{name}-tools-extra = %{evr}				\
 Requires:	%{name}-tools = %{evr}					\
 Provides:	%{name}-efi = %{evr}					\
+%{?legacy_provides:Provides:	%{name} = %{evr}}			\
 %{-o:Obsoletes:	%{name}-efi < %{evr}}					\
 									\
 %{expand:%%description %{1}}						\
diff --git a/grub2.spec b/grub2.spec
index 0ce84be..23ac5a9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -454,6 +454,10 @@ fi
 %endif
 
 %changelog
+* Wed Sep 20 2017 Peter Jones <pjones@redhat.com> - 2.02-18
+- Make grub2-efi-aa64 provide grub2
+  Resolves: rhbz#1491045
+
 * Mon Sep 11 2017 Dennis Gilmore <dennis@ausil.us> - 2.02-17
 - bump for Obsoletes again