From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 2 Aug 2021 15:52:20 +0000 (+0100)
Subject: rpm: use direct remote connection for Fedora >= 35 / RHEL >= 9
X-Git-Tag: v7.7.0-rc1~293
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5998497d5f736365ab7ed8cd55157c85a8c6e2b0;p=thirdparty%2Flibvirt.git

rpm: use direct remote connection for Fedora >= 35 / RHEL >= 9

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 38c50bd07f..a162bc333d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -183,7 +183,7 @@
 
 %define with_modular_daemons 0
 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
-%define with_modular_daemons 1
+    %define with_modular_daemons 1
 %endif
 
 # Force QEMU to run as non-root
@@ -1081,6 +1081,12 @@ exit 1
     %define arg_libssh2 -Dlibssh2=disabled
 %endif
 
+%if %{with_modular_daemons}
+    %define arg_remote_mode -Dremote_default_mode=direct
+%else
+    %define arg_remote_mode -Dremote_default_mode=legacy
+%endif
+
 %define when  %(date +"%%F-%%T")
 %define where %(hostname)
 %define who   %{?packager}%{!?packager:Unknown}
@@ -1111,7 +1117,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
            -Ddriver_vz=disabled \
            -Ddriver_bhyve=disabled \
            -Ddriver_ch=disabled \
-           -Dremote_default_mode=legacy \
+           %{?arg_remote_mode} \
            -Ddriver_interface=enabled \
            -Ddriver_network=enabled \
            -Dstorage_fs=enabled \