From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 14 May 2021 11:56:23 +0000 (+0100)
Subject: rpm: disable glusterfs on RHEL-9
X-Git-Tag: v7.4.0-rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f772c1fd2a;p=thirdparty%2Flibvirt.git

rpm: disable glusterfs on RHEL-9

Support for glusterfs with KVM is being dropped in RHEL-9 in the
virtualization stack.

Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 8ac324be0a..cdca7d8db6 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -65,10 +65,15 @@
 %endif
 
 %define with_storage_gluster 0%{!?_without_storage_gluster:1}
-%ifnarch %{arches_qemu_kvm}
-    # gluster is only built where qemu driver is enabled on RHEL
-    %if 0%{?rhel}
+%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
 %endif