[PATCH 1/2] spec: Bump min_rhel

From: Michal Privoznik <mprivozn(a)redhat.com&gt; RHEL-8 is out of our support scope. The minimal version we aim to support upstream is RHEL-9. Reflect this in the spec file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- libvirt.spec.in | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e12bec18d5..59e144ce4b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -3,17 +3,15 @@ # This spec file assumes you are building on a Fedora or RHEL version # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. -%define min_rhel 8 +%define min_rhel 9 %define min_fedora 37 %define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64 %if 0%{?rhel} %if 0%{?rhel} >= 10 %define arches_qemu_kvm x86_64 aarch64 s390x riscv64 - %elif 0%{?rhel} >= 9 + %else %define arches_qemu_kvm x86_64 aarch64 s390x - %else - %define arches_qemu_kvm x86_64 %{power64} aarch64 s390x %endif %endif @@ -74,15 +72,8 @@ %define with_storage_gluster 0%{!?_without_storage_gluster:1} %if 0%{?rhel} - # Glusterfs has been dropped in RHEL-9, and before that - # was only enabled on arches where KVM exists - %if 0%{?rhel} > 8 - %define with_storage_gluster 0 - %else - %ifnarch %{arches_qemu_kvm} - %define with_storage_gluster 0 - %endif - %endif + # Glusterfs has been dropped in RHEL-9. + %define with_storage_gluster 0 %endif # Fedora had zfs-fuse until F43 @@ -94,7 +85,7 @@ %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} # libiscsi has been dropped in RHEL-9 -%if 0%{?rhel} > 8 +%if 0%{?rhel} %define with_storage_iscsi_direct 0 %endif @@ -150,10 +141,6 @@ %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} -%if 0%{?rhel} && 0%{?rhel} < 9 - %define with_netcf 0%{!?_without_netcf:1} -%endif - # fuse is used to provide virtualized /proc for LXC %if %{with_lxc} %define with_fuse 0%{!?_without_fuse:1} @@ -195,8 +182,7 @@ # Right now that's not the case anywhere, but things should be fine by the time # Fedora 40 is released. %if %{with_qemu} - # rhel-8 lacks pidfd_open - %if 0%{?fedora} || 0%{?rhel} >= 9 + %if 0%{?fedora} || 0%{?rhel} %define with_nbdkit 0%{!?_without_nbdkit:1} # setting 'with_nbdkit_config_default' must be done only when compiling @@ -215,7 +201,7 @@ %endif %define with_modular_daemons 0 -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %define with_modular_daemons 1 %endif @@ -275,7 +261,7 @@ # Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which # does not require enabling vm.unprivileged_userfaultfd sysctl. -%if 0%{?fedora} || 0%{?rhel} >= 9 +%if 0%{?fedora} || 0%{?rhel} %define with_userfaultfd_sysctl 0 %endif @@ -856,7 +842,7 @@ Requires: swtpm-tools %if %{with_numad} Requires: numad %endif - %if 0%{?fedora} || 0%{?rhel} >= 9 + %if 0%{?fedora} || 0%{?rhel} Recommends: passt Recommends: passt-selinux %endif -- 2.49.0