From fd4c8131f5c54c099a1a7a17ac4b5335745f4c72 Mon Sep 17 00:00:00 2001
From: liujinfeng <liujinfeng@cqsoftware.com.cn>
Date: Mon, 19 Aug 2024 18:06:08 +0800
Subject: [PATCH] Fix the anomaly in package description display.

---
 grub.macros | 6 ------
 grub2.spec  | 5 ++++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/grub.macros b/grub.macros
index 5898b2d..decc440 100644
--- a/grub.macros
+++ b/grub.macros
@@ -237,7 +237,6 @@ Requires:	%{name}-tools = %{evr}					\
 Requires(pre):	dracut							\
 Requires(post): dracut							\
 %{expand:%%description %%{1}}						\
-%{desc}									\
 This subpackage provides support for %{1} systems.			\
 									\
 %{expand:%%{?!buildsubdir:%%define buildsubdir grub-%%{1}-%{tarversion}}}\
@@ -248,7 +247,6 @@ Group:		System Environment/Base					\
 BuildArch:	noarch							\
 Requires:	%%{name}-common = %%{evr}				\
 %%description %%{1}-modules						\
-%%{desc}								\
 This subpackage provides support for rebuilding your own grub.efi.	\
 %%endif									\
 }									\
@@ -264,7 +262,6 @@ Requires:	os-prober >= 1.58-11					\
 Requires:	gettext which file					\
 									\
 %{expand:%%description %%{1}-tools}					\
-%{desc}									\
 This subpackage provides tools for support of %%{1} platforms.		\
 %{nil}
 
@@ -284,7 +281,6 @@ Provides:	%{name}-efi = %{evr}					\
 %{-o:Obsoletes:	%{name}-efi < %{evr}}					\
 									\
 %{expand:%%description %{1}}						\
-%{desc}									\
 This subpackage provides support for %{1} systems.			\
 %pre %{1}								\
 res=$(grub2-probe /boot)						\
@@ -310,7 +306,6 @@ Requires:	%{name}-common = %{evr}					\
 Provides:	%{name}-efi-modules = %{evr}				\
 Obsoletes:	%{name}-efi-modules < %{evr}				\
 %{expand:%%description %{1}-modules}					\
-%{desc}									\
 This subpackage provides support for rebuilding your own grub.efi.	\
 %endif}									\
 									\
@@ -320,7 +315,6 @@ Group:		System Environment/Base					\
 Requires:	%{name}-common = %{evr}					\
 Provides:	%{name}-efi-cdboot = %{evr}				\
 %{expand:%%description %{1}-cdboot}					\
-%{desc}									\
 This subpackage provides optional components of grub used with removeable media on %{1} systems.\
 %{nil}
 
diff --git a/grub2.spec b/grub2.spec
index ba094ce..26253aa 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -8,7 +8,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.04
-Release:	39
+Release:	40
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -442,6 +442,9 @@ rm -r /boot/grub2.tmp/ || :
 %{_datadir}/man/man*
 
 %changelog
+* Mon Aug 19 2024 Jinfeng Liu <liujinfeng@cqsoftware.com.cn> - 1:2.04-40
+- Fix the anomaly in package description display.
+
 * Tue Jun 25 2024 zhangqiumiao <zhangqiumiao1@huawei.com> - 1:2.04-39
 - Type:bugfix
 - CVE:NA
-- 
Gitee