[PATCH V3 10/11] spec: Remove libvirt-daemon dependency from hypervisor subpackages

[Daniel P. Berrangé]

On Tue, Dec 20, 2022 at 02:26:26PM -0700, Jim Fehlig wrote:
> Remove the libvirt-daemon dependency from the various
> libvirt-daemon-<hypervisor> subpackages, replacing it with a set of the
> new sub subpackages providing the same functionality.
> 
> Signed-off-by: Jim Fehlig <jfehlig at suse.com>
> ---
>  libvirt.spec.in | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index d6b6bc2ebf..edb736d21a 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -820,7 +820,14 @@ Libxl
>  %package daemon-qemu
>  Summary: Server side daemon & driver required to run QEMU guests
>  
> +    %if %{with_modular_daemons}
> +Requires: libvirt-daemon-common = %{version}-%{release}
> +Requires: libvirt-daemon-log = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}
> +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
> +    %else
>  Requires: libvirt-daemon = %{version}-%{release}
> +    %endif
>  Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
>  Requires: libvirt-daemon-driver-interface = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
> @@ -839,7 +846,14 @@ capabilities of the QEMU TCG emulators
>  %package daemon-kvm
>  Summary: Server side daemon & driver required to run KVM guests
>  
> +    %if %{with_modular_daemons}
> +Requires: libvirt-daemon-common = %{version}-%{release}
> +Requires: libvirt-daemon-log = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}
> +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
> +    %else
>  Requires: libvirt-daemon = %{version}-%{release}
> +    %endif

For these two you've made the deps conditional
on with_modular_daemons which makes sense.

>  Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
>  Requires: libvirt-daemon-driver-interface = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
> @@ -858,7 +872,7 @@ capabilities of the KVM hypervisor
>  %package daemon-lxc
>  Summary: Server side daemon & driver required to run LXC guests
>  
> -Requires: libvirt-daemon = %{version}-%{release}
> +Requires: libvirt-daemon-common = %{version}-%{release}
>  Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
>  Requires: libvirt-daemon-driver-interface = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
> @@ -876,7 +890,9 @@ capabilities of LXC
>  %package daemon-xen
>  Summary: Server side daemon & driver required to run XEN guests
>  
> -Requires: libvirt-daemon = %{version}-%{release}
> +Requires: libvirt-daemon-common = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}
> +Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
>  Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
>  Requires: libvirt-daemon-driver-interface = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}
> @@ -895,7 +911,7 @@ capabilities of XEN
>  %package daemon-vbox
>  Summary: Server side daemon & driver required to run VirtualBox guests
>  
> -Requires: libvirt-daemon = %{version}-%{release}
> +Requires: libvirt-daemon-common = %{version}-%{release}
>  Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
>  Requires: libvirt-daemon-driver-interface = %{version}-%{release}
>  Requires: libvirt-daemon-driver-network = %{version}-%{release}

THese three have been unconditionally changed and ignore
with_modular_daemons which looks wrong by comparison.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|