From 5483b91753d05f3b96ba19a0b413ed1a64415f6c Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Wed, 23 Mar 2022 23:23:56 +0800
Subject: [PATCH] optimise Conflicts version of grubby

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 grub2.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grub2.spec b/grub2.spec
index 6b5d11c..bda23d9 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,3 +1,4 @@
+%define anolis_release 4
 %global _lto_cflags %{nil}
 
 %undefine _hardened_build
@@ -12,7 +13,7 @@
 Name:		grub2
 Epoch:          1 
 Version:	2.06
-Release:	3%{?dist}
+Release:	%{anolis_release}%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -73,7 +74,7 @@ hardware devices.\
 %package common
 Summary:	grub2 common layout
 BuildArch:	noarch
-Conflicts:	grubby < 8.40-18
+Conflicts:	grubby < 8.40
 Requires(post): util-linux
 
 %description common
@@ -500,6 +501,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Wed Mar 23 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.06-4
+- optimise Conflicts version of grubby
+
 * Wed Mar 23 2022 forrest_ly <flin@linux.alibaba.com> - 2.06-3
 - Build pc-modules on x86-64
 
-- 
Gitee