From c1d59137d6c07a1cb634e2d2f482be183bbe7f42 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 22 Dec 2023 23:17:44 +0300 Subject: [PATCH] Fix condition in Conflicts --- SOURCES/grub.macros | 4 ++-- SPECS/grub2.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros index 3f20cd2..8b54532 100644 --- a/SOURCES/grub.macros +++ b/SOURCES/grub.macros @@ -289,8 +289,8 @@ Requires: %{efi_esp_dir}/shim%%(echo %{1} | cut -d- -f2).efi \ Provides: %{name}-efi = %{evr} \ Provides: msvsphere(grub2-sig-key) = 202303 \ %{expand:%%ifarch x86_64 \ -Conflicts: shim-x64 <= 15.6-1.el8.inferit \ -Conflicts: shim-ia32 <= 15.6-1.el8.inferit \ +Conflicts: shim-x64 < 15.6-1.el8.inferit \ +Conflicts: shim-ia32 < 15.6-1.el8.inferit \ %%endif} \ %{?legacy_provides:Provides: %{name} = %{evr}} \ %{-o:Obsoletes: %{name}-efi < %{evr}} \ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index a929cdd..d7f32c1 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -11,7 +11,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 150%{?dist}.inferit +Release: 150%{?dist}.inferit.1 Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base License: GPLv3+ @@ -521,6 +521,9 @@ fi %endif %changelog +* Fri Dec 22 2023 Arkady L. Shane - 2.02-150.inferit.1 +- Fix condition in Conflicts + * Wed Dec 20 2023 Arkady L. Shane - 2.02-150.inferit - Modified to use MSVSphere Secure Boot certificates - Drop brackets from grub menu (INF-738)