From 94108cdd59864a5f267a11e3324e603ad6f60323 Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 15 May 2024 17:55:49 +0200
Subject: [PATCH] rpm: Drop with_ssh_proxy define
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As a general rule, we use defines for features that can only be
enabled on a subset of the platforms that we target, and we
don't offer fine-grained control over every single possible
meson configuration knob at the RPM level.

In the case of ssh-proxy, we are enabling it everywhere already,
so having a define for it is unnecessary.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 libvirt.spec.in | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 5cb19fa433..bea3c827bc 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -91,7 +91,6 @@
 # Other optional features
 %define with_numactl          0%{!?_without_numactl:1}
 %define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1}
-%define with_ssh_proxy        0%{!?_without_ssh_proxy:1}
 
 # A few optional bits off by default, we enable later
 %define with_fuse             0
@@ -904,9 +903,7 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-        %if %{with_ssh_proxy}
 Requires: libvirt-ssh-proxy = %{version}-%{release}
-        %endif
 Requires: qemu
 
 %description daemon-qemu
@@ -935,9 +932,7 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-        %if %{with_ssh_proxy}
 Requires: libvirt-ssh-proxy = %{version}-%{release}
-        %endif
 Requires: qemu-kvm
 
 %description daemon-kvm
@@ -1107,14 +1102,12 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Libvirt plugin for NSS for translating domain names into IP addresses.
 %endif
 
-%if %{with_ssh_proxy}
 %package ssh-proxy
 Summary: Libvirt SSH proxy
 Requires: libvirt-libs = %{version}-%{release}
 
 %description ssh-proxy
 Allows SSH into domains via VSOCK without need for network.
-%endif
 
 %if %{with_mingw32}
 %package -n mingw32-libvirt
@@ -1307,12 +1300,6 @@ exit 1
     %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled
 %endif
 
-%if %{with_ssh_proxy}
-    %define arg_ssh_proxy -Dssh_proxy=enabled
-%else
-    %define arg_ssh_proxy -Dssh_proxy=disabled
-%endif
-
 %define when  %(date +"%%F-%%T")
 %define where %(hostname)
 %define who   %{?packager}%{!?packager:Unknown}
@@ -1394,7 +1381,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
            -Dtls_priority=%{tls_priority} \
            -Dsysctl_config=enabled \
            %{?arg_userfaultfd_sysctl} \
-           %{?arg_ssh_proxy} \
+           -Dssh_proxy=enabled \
            %{?enable_werror} \
            -Dexpensive_tests=enabled \
            -Dinit_script=systemd \
@@ -2450,11 +2437,9 @@ exit 0
 %{_libdir}/libnss_libvirt.so.2
 %{_libdir}/libnss_libvirt_guest.so.2
 
-    %if %{with_ssh_proxy}
 %files ssh-proxy
 %config(noreplace) %{_sysconfdir}/ssh/ssh_config.d/30-libvirt-ssh-proxy.conf
 %{_libexecdir}/libvirt-ssh-proxy
-    %endif
 
     %if %{with_lxc}
 %files login-shell