Don't obsolete the tools package with extra/efi

The extra/efi packages aren't needed in a lot of use cases.
The efi subpackage is actually only useful on EFI based macs.
The extra subpackage isn't useful on cloud/server and a lot
of places where there's no need for pretty GUIs. Stop obsoleting
the tools package so that they're pulled in with every update
even though they may have been actively remove by images or users.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
[rharwood: bump spec]
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Peter Robinson 2022-11-22 14:48:06 +00:00 committed by Robbie Harwood
parent 06e51d2a65
commit 558410c2d9

View File

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 64%{?dist} Release: 65%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -94,7 +94,6 @@ subpackages.
%package tools %package tools
Summary: Support tools for GRUB. Summary: Support tools for GRUB.
Obsoletes: grub2-tools < %{evr}
Requires: grub2-common = %{epoch}:%{version}-%{release} Requires: grub2-common = %{epoch}:%{version}-%{release}
Requires: gettext-runtime os-prober file Requires: gettext-runtime os-prober file
Requires(pre): dracut Requires(pre): dracut
@ -110,7 +109,6 @@ This subpackage provides tools for support of all platforms.
Summary: Support tools for GRUB. Summary: Support tools for GRUB.
Requires: gettext-runtime os-prober file Requires: gettext-runtime os-prober file
Requires: grub2-common = %{epoch}:%{version}-%{release} Requires: grub2-common = %{epoch}:%{version}-%{release}
Obsoletes: grub2-tools < %{evr}
%description tools-efi %description tools-efi
%{desc} %{desc}
@ -133,7 +131,6 @@ Requires: gettext-runtime os-prober file
Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release} Requires: grub2-tools-minimal = %{epoch}:%{version}-%{release}
Requires: grub2-common = %{epoch}:%{version}-%{release} Requires: grub2-common = %{epoch}:%{version}-%{release}
Requires: mtools Requires: mtools
Obsoletes: grub2-tools < %{evr}
%description tools-extra %description tools-extra
%{desc} %{desc}
@ -532,6 +529,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Tue Nov 22 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-65
- Don't obsolete the tools package with extra/efi (pbrobinson)
* Mon Nov 21 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-64 * Mon Nov 21 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-64
- Forward-port ppc64le image creation (with nerfed signing) - Forward-port ppc64le image creation (with nerfed signing)