Re: [libvirt] [PATCH 4/n] spec: default vbox according to libvirtd build

Commit ba5f3c7 moved virtualBox support into libvirtd, but the spec file was still unconditionally requesting it even when not building the server side. This leads to the weird result of building libvirt-client and libvirt-daemon-lxc rpms when client_only is requested (via manual edit, or via RHEL 5 on s390). * libvirt.spec.in (with_vbox): Hoist to server conditionals. Signed-off-by: Eric Blake <eblake(a)redhat.com&gt; --- I'm still chasing down other oddities (at least a 5/n is needed to fix a file leftover during 'make rpm', as mentioned in the log of 3a/n), before I can actually verify my claim that the wrong rpms are built from a client-only build; but wanted to post this at least for a logical review. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index affd2ec..e4b8329 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -50,6 +50,7 @@ %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} +%define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts @@ -71,7 +72,6 @@ # Then the hypervisor drivers that run outside libvirtd, in libvirt.so %define with_openvz 0%{!?_without_openvz:1} -%define with_vbox 0%{!?_without_vbox:1} %define with_vmware 0%{!?_without_vmware:1} %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1}