From e861a70938b9f02b9295ad17495c586deff11cb1 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Mon, 19 Dec 2022 21:20:04 +0800
Subject: [PATCH] Deal with gettext-runtime migration

---
 grub.macros |  5 ++---
 grub2.spec  | 15 ++++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/grub.macros b/grub.macros
index 0afdd32..ed93ec5 100644
--- a/grub.macros
+++ b/grub.macros
@@ -242,7 +242,7 @@ Obsoletes:	%{name} < %{evr}					\
 Requires:	%{name}-common = %{evr}					\
 Requires:	%{name}-tools-minimal = %{evr}				\
 Requires:	%{name}-%{1}-modules = %{evr}				\
-Requires:	gettext which file					\
+Requires:	gettext-runtime which file				\
 Requires:	%{name}-tools = %{evr}					\
 Requires(pre):	dracut							\
 Requires(post): dracut							\
@@ -265,11 +265,10 @@ 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.					\
-Requires:	gettext os-prober which file system-logos		\
+Requires:	gettext-runtime os-prober which file system-logos	\
 Requires:	%{name}-common = %{evr}					\
 Requires:	%{name}-tools-minimal = %{evr}				\
 Requires:	os-prober >= 1.58-11					\
-Requires:	gettext which file					\
 									\
 %{expand:%%description %%{1}-tools}					\
 %{desc}									\
diff --git a/grub2.spec b/grub2.spec
index db294b1..d6c657c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,4 +1,4 @@
-%define anolis_release 7
+%define anolis_release 8
 %global _lto_cflags %{nil}
 
 %undefine _hardened_build
@@ -93,7 +93,7 @@ The %{name}-doc package contains documentation files for %{name}.
 Summary:	Support tools for GRUB.
 Obsoletes:	%{name}-tools < %{evr}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	gettext os-prober which file
+Requires:	gettext-runtime os-prober which file
 Requires(pre):	dracut
 Requires(post):	dracut
 
@@ -104,7 +104,7 @@ This subpackage provides tools for support of all platforms.
 %ifarch x86_64
 %package tools-efi
 Summary:	Support tools for GRUB.
-Requires:	gettext os-prober which file
+Requires:	gettext-runtime os-prober which file
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-tools < %{evr}
 
@@ -115,7 +115,7 @@ This subpackage provides tools for support of EFI platforms.
 
 %package tools-minimal
 Summary:	Support tools for GRUB.
-Requires:	gettext
+Requires:	gettext-runtime
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-tools < %{evr}
 
@@ -125,7 +125,7 @@ This subpackage provides tools for support of all platforms.
 
 %package tools-extra
 Summary:	Support tools for GRUB.
-Requires:	gettext os-prober which file
+Requires:	gettext-runtime os-prober which file
 Requires:	%{name}-tools-minimal = %{epoch}:%{version}-%{release}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Obsoletes:	%{name}-tools < %{evr}
@@ -216,7 +216,6 @@ makeinfo --html --no-split -I docs -o docs/grub.html \
 
 %install
 set -e
-rm -fr $RPM_BUILD_ROOT
 
 %do_common_install
 %if 0%{with_efi_arch}
@@ -231,7 +230,6 @@ rm -fr $RPM_BUILD_ROOT
 %if 0%{with_emu_arch}
 %{expand:%do_emu_install %%{package_arch}}
 %endif
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 ln -s %{name}-set-password ${RPM_BUILD_ROOT}/%{_sbindir}/%{name}-setpassword
 echo '.so man8/%{name}-set-password.8' > ${RPM_BUILD_ROOT}/%{_datadir}/man/man8/%{name}-setpassword.8
 %ifnarch x86_64
@@ -507,6 +505,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Dec 19 2022 Funda Wang <fundawang@yeah.net> - 2.06-8
+- Deal with gettext-runtime migration
+
 * Mon Nov 21 2022 yuanhui <yuanhui@linux.alibaba.com> - 2.06-7
 - fix the bugs about video readers in grub2
 - fix several fuzz issues with invalid dir
-- 
Gitee