diff --git a/kiwi.spec b/kiwi.spec index c14945d..b7bb81e 100644 --- a/kiwi.spec +++ b/kiwi.spec @@ -12,7 +12,7 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. Name: kiwi Version: 9.24.15 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://osinside.github.io/kiwi/ Summary: Flexible operating system image builder License: GPLv3+ @@ -130,12 +130,14 @@ Requires: syslinux %endif %ifarch x86_64 Requires: grub2-efi-x64-cdboot +%if ! 0%{?rhel} Requires: grub2-efi-ia32-cdboot %endif +%endif %ifarch aarch64 Requires: grub2-efi-aa64-cdboot %endif -%if 0%{?fedora} +%if ! 0%{?rhel} %ifarch %{arm} Requires: grub2-efi-arm-cdboot %endif @@ -165,9 +167,11 @@ Requires: grub2-tools-efi %ifarch x86_64 Requires: grub2-efi-x64 Requires: grub2-efi-x64-modules +%if ! 0%{?rhel} Requires: grub2-efi-ia32 Requires: grub2-efi-ia32-modules %endif +%endif %ifarch %{ix86} x86_64 Requires: grub2-pc Requires: grub2-pc-modules @@ -175,8 +179,8 @@ Requires: grub2-pc-modules %ifarch aarch64 Requires: grub2-efi-aa64-modules %endif -%if 0%{?fedora} -# grub-efi for armv7hl is only available for Fedora +%if ! 0%{?rhel} +# grub-efi for armv7hl is not available in RHEL %ifarch %{arm} Requires: grub2-efi-arm Requires: grub2-efi-arm-modules @@ -534,6 +538,11 @@ done # Empty metapackage %changelog +* Tue Jan 04 2022 Neal Gompa - 9.24.15-3 +- Rework conditionals for grub2-efi packages + + Drop grub2-efi-ia32 dependencies for RHEL for now (RH#1997734) + + Convert Fedora conditionals to "not RHEL" conditionals + * Sun Jan 02 2022 Neal Gompa - 9.24.15-2 - Add missing util-linux dependency for Koji build environments - Add missing dracut-network dependency for dracut-kiwi-live package