Fix condition in Conflicts

i8 changed/i8/grub2-2.02-150.el8.inferit.1
Arkady L. Shane 1 year ago
parent 1b8ef8a8a2
commit c1d59137d6
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -289,8 +289,8 @@ Requires: %{efi_esp_dir}/shim%%(echo %{1} | cut -d- -f2).efi \
Provides: %{name}-efi = %{evr} \ Provides: %{name}-efi = %{evr} \
Provides: msvsphere(grub2-sig-key) = 202303 \ Provides: msvsphere(grub2-sig-key) = 202303 \
%{expand:%%ifarch x86_64 \ %{expand:%%ifarch x86_64 \
Conflicts: shim-x64 <= 15.6-1.el8.inferit \ Conflicts: shim-x64 < 15.6-1.el8.inferit \
Conflicts: shim-ia32 <= 15.6-1.el8.inferit \ Conflicts: shim-ia32 < 15.6-1.el8.inferit \
%%endif} \ %%endif} \
%{?legacy_provides:Provides: %{name} = %{evr}} \ %{?legacy_provides:Provides: %{name} = %{evr}} \
%{-o:Obsoletes: %{name}-efi < %{evr}} \ %{-o:Obsoletes: %{name}-efi < %{evr}} \

@ -11,7 +11,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 150%{?dist}.inferit Release: 150%{?dist}.inferit.1
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -521,6 +521,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Dec 22 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit.1
- Fix condition in Conflicts
* Wed Dec 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit * Wed Dec 20 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.02-150.inferit
- Modified to use MSVSphere Secure Boot certificates - Modified to use MSVSphere Secure Boot certificates
- Drop brackets from grub menu (INF-738) - Drop brackets from grub menu (INF-738)

Loading…
Cancel
Save