From e1f4c0ec1e8248e0bb5824c1f0252c03ce402cc0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 20 Sep 2017 15:27:19 -0400 Subject: [PATCH] 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 --- grub.macros | 5 +++++ grub2.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/grub.macros b/grub.macros index fab76aae..44c68863 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 0ce84bec..23ac5a99 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 - 2.02-18 +- Make grub2-efi-aa64 provide grub2 + Resolves: rhbz#1491045 + * Mon Sep 11 2017 Dennis Gilmore - 2.02-17 - bump for Obsoletes again