From 8733281382c3c3509d8abb68611712afd17eb58a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 4 Dec 2019 19:42:12 +0000 Subject: [PATCH] various grub2 cleanups - drop deprecated groups from the macros file, already gone from main spec. - don't ship arch specific bits in tools-extra that are already special cased in tools - move grub2-glue-efi to tools-efi, it's Mac specific and there's othe Mac efi tools there - drop tools-extra dep for efi binaries, all in tools-efi and anaconda deals with that - put grub2-install man page in the right package with the util - other minor cleanups --- grub.macros | 7 ------- grub2.spec | 30 ++++++++++++++---------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/grub.macros b/grub.macros index 5da3592..5e88439 100644 --- a/grub.macros +++ b/grub.macros @@ -224,7 +224,6 @@ %define define_legacy_variant() \ %{expand:%%package %%{1}} \ Summary: Bootloader with support for Linux, Multiboot, and more \ -Group: System Environment/Base \ Provides: %{name} = %{evr} \ Obsoletes: %{name} < %{evr} \ Requires: %{name}-common = %{evr} \ @@ -243,7 +242,6 @@ This subpackage provides support for %{1} systems. \ %{expand:%%if 0%%{with_legacy_modules} \ %%package %%{1}-modules \ Summary: Modules used to build custom grub images \ -Group: System Environment/Base \ BuildArch: noarch \ Requires: %%{name}-common = %%{evr} \ %%description %%{1}-modules \ @@ -255,7 +253,6 @@ This subpackage provides support for rebuilding your own grub.efi. \ %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\ %{expand:%%package %%{1}-tools} \ Summary: Support tools for GRUB. \ -Group: System Environment/Base \ Requires: gettext os-prober which file system-logos \ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal = %{evr} \ @@ -270,11 +267,9 @@ This subpackage provides tools for support of %%{1} platforms. \ %define define_efi_variant(o) \ %{expand:%%package %{1}} \ Summary: GRUB for EFI systems. \ -Group: System Environment/Base \ Requires: efi-filesystem \ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal >= %{evr} \ -Requires: %{name}-tools-extra = %{evr} \ Requires: %{name}-tools = %{evr} \ Provides: %{name}-efi = %{evr} \ %{?legacy_provides:Provides: %{name} = %{evr}} \ @@ -288,7 +283,6 @@ This subpackage provides support for %{1} systems. \ %{expand:%if 0%{?with_efi_modules} \ %{expand:%%package %{1}-modules} \ Summary: Modules used to build custom grub.efi images \ -Group: System Environment/Base \ BuildArch: noarch \ Requires: %{name}-common = %{evr} \ Provides: %{name}-efi-modules = %{evr} \ @@ -300,7 +294,6 @@ This subpackage provides support for rebuilding your own grub.efi. \ \ %{expand:%%package %{1}-cdboot} \ Summary: Files used to boot removeable media with EFI \ -Group: System Environment/Base \ Requires: %{name}-common = %{evr} \ Provides: %{name}-efi-cdboot = %{evr} \ %{expand:%%description %{1}-cdboot} \ diff --git a/grub2.spec b/grub2.spec index cfa434b..c627c0f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -354,13 +354,9 @@ rm -r /boot/grub2.tmp/ || : %exclude /boot/grub2/* %dir %attr(0700,root,root) %{efi_esp_dir} %exclude %{efi_esp_dir}/* -%license COPYING %ghost %config(noreplace) /boot/grub2/grubenv -%doc INSTALL -%doc NEWS -%doc README +%license COPYING %doc THANKS -%doc TODO %doc docs/grub.html %doc docs/grub-dev.html %doc docs/font_char_metrics.png @@ -384,10 +380,12 @@ rm -r /boot/grub2.tmp/ || : %ifarch x86_64 %files tools-efi -%{_sbindir}/%{name}-macbless +%{_bindir}/%{name}-glue-efi %{_bindir}/%{name}-render-label -%{_datadir}/man/man8/%{name}-macbless* +%{_sbindir}/%{name}-macbless +%{_datadir}/man/man1/%{name}-glue-efi* %{_datadir}/man/man1/%{name}-render-label* +%{_datadir}/man/man8/%{name}-macbless* %endif %files tools @@ -423,7 +421,6 @@ rm -r /boot/grub2.tmp/ || : # exclude man pages from tools-extra %exclude %{_datadir}/man/man8/%{name}-sparc64-setup* -%exclude %{_datadir}/man/man8/%{name}-install* %exclude %{_datadir}/man/man1/%{name}-fstest* %exclude %{_datadir}/man/man1/%{name}-glue-efi* %exclude %{_datadir}/man/man1/%{name}-kbdcomp* @@ -466,32 +463,33 @@ rm -r /boot/grub2.tmp/ || : %endif %files tools-extra -%{_sbindir}/%{name}-sparc64-setup -%{_sbindir}/%{name}-ofpathname %{_bindir}/%{name}-fstest -%{_bindir}/%{name}-glue-efi %{_bindir}/%{name}-kbdcomp %{_bindir}/%{name}-mkfont %{_bindir}/%{name}-mklayout %{_bindir}/%{name}-mknetdir %ifnarch %{sparc} %{_bindir}/%{name}-mkrescue +%{_datadir}/man/man1/%{name}-mkrescue* +%else +%exclude %{_datadir}/man/man1/%{name}-mkrescue* %endif %{_bindir}/%{name}-mkstandalone %{_bindir}/%{name}-syslinux2cfg %{_sysconfdir}/sysconfig/grub -%{_datadir}/man/man8/%{name}-sparc64-setup* -%{_datadir}/man/man8/%{name}-install* %{_datadir}/man/man1/%{name}-fstest* -%{_datadir}/man/man1/%{name}-glue-efi* %{_datadir}/man/man1/%{name}-kbdcomp* %{_datadir}/man/man1/%{name}-mkfont* %{_datadir}/man/man1/%{name}-mklayout* %{_datadir}/man/man1/%{name}-mknetdir* -%{_datadir}/man/man1/%{name}-mkrescue* %{_datadir}/man/man1/%{name}-mkstandalone* -%{_datadir}/man/man8/%{name}-ofpathname* %{_datadir}/man/man1/%{name}-syslinux2cfg* +%exclude %{_bindir}/%{name}-glue-efi +%exclude %{_sbindir}/%{name}-sparc64-setup +%exclude %{_sbindir}/%{name}-ofpathname +%exclude %{_datadir}/man/man1/%{name}-glue-efi* +%exclude %{_datadir}/man/man8/%{name}-ofpathname* +%exclude %{_datadir}/man/man8/%{name}-sparc64-setup* %exclude %{_datarootdir}/grub/themes/starfield %if 0%{with_efi_arch}