spec: Explicitly require matching libvirt-libs

All drivers now link directly to libvirt.so rather than getting the
symbols from the daemon. Let's explicitly mention this dependency in the
spec file instead of relying on transitive dependency from
libvirt-daemon.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2018-07-09 17:45:45 +02:00
parent 80dacadf8e
commit 073d5041c7

View File

@ -544,6 +544,7 @@ Network filter configuration files for cleaning guest traffic
%package daemon-driver-network %package daemon-driver-network
Summary: Network driver plugin for the libvirtd daemon Summary: Network driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: dnsmasq >= 2.41 Requires: dnsmasq >= 2.41
Requires: radvd Requires: radvd
Requires: iptables Requires: iptables
@ -560,6 +561,7 @@ bridge capabilities.
%package daemon-driver-nwfilter %package daemon-driver-nwfilter
Summary: Nwfilter driver plugin for the libvirtd daemon Summary: Nwfilter driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: iptables Requires: iptables
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
Requires: iptables-ipv6 Requires: iptables-ipv6
@ -575,6 +577,7 @@ iptables and ip6tables capabilities
%package daemon-driver-nodedev %package daemon-driver-nodedev
Summary: Nodedev driver plugin for the libvirtd daemon Summary: Nodedev driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
# needed for device enumeration # needed for device enumeration
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora} || 0%{?rhel} >= 7
Requires: systemd >= 185 Requires: systemd >= 185
@ -591,6 +594,7 @@ capabilities.
%package daemon-driver-interface %package daemon-driver-interface
Summary: Interface driver plugin for the libvirtd daemon Summary: Interface driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%if (0%{?fedora} || 0%{?rhel} >= 7) %if (0%{?fedora} || 0%{?rhel} >= 7)
Requires: netcf-libs >= 0.2.2 Requires: netcf-libs >= 0.2.2
%endif %endif
@ -604,6 +608,7 @@ netcf library
%package daemon-driver-secret %package daemon-driver-secret
Summary: Secret driver plugin for the libvirtd daemon Summary: Secret driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-secret %description daemon-driver-secret
The secret driver plugin for the libvirtd daemon, providing The secret driver plugin for the libvirtd daemon, providing
@ -612,6 +617,7 @@ an implementation of the secret key APIs.
%package daemon-driver-storage-core %package daemon-driver-storage-core
Summary: Storage driver plugin including base backends for the libvirtd daemon Summary: Storage driver plugin including base backends for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: nfs-utils Requires: nfs-utils
# For mkfs # For mkfs
Requires: util-linux Requires: util-linux
@ -628,6 +634,7 @@ iSCSI, and multipath storage.
%package daemon-driver-storage-logical %package daemon-driver-storage-logical
Summary: Storage driver plugin for lvm volumes Summary: Storage driver plugin for lvm volumes
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: lvm2 Requires: lvm2
%description daemon-driver-storage-logical %description daemon-driver-storage-logical
@ -638,6 +645,7 @@ volumes using lvm.
%package daemon-driver-storage-disk %package daemon-driver-storage-disk
Summary: Storage driver plugin for disk Summary: Storage driver plugin for disk
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: parted Requires: parted
Requires: device-mapper Requires: device-mapper
@ -649,6 +657,7 @@ volumes using the host disks.
%package daemon-driver-storage-scsi %package daemon-driver-storage-scsi
Summary: Storage driver plugin for local scsi devices Summary: Storage driver plugin for local scsi devices
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-storage-scsi %description daemon-driver-storage-scsi
The storage driver backend adding implementation of the storage APIs for scsi The storage driver backend adding implementation of the storage APIs for scsi
@ -658,6 +667,7 @@ host devices.
%package daemon-driver-storage-iscsi %package daemon-driver-storage-iscsi
Summary: Storage driver plugin for iscsi Summary: Storage driver plugin for iscsi
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: iscsi-initiator-utils Requires: iscsi-initiator-utils
%description daemon-driver-storage-iscsi %description daemon-driver-storage-iscsi
@ -668,6 +678,7 @@ volumes using the host iscsi stack.
%package daemon-driver-storage-mpath %package daemon-driver-storage-mpath
Summary: Storage driver plugin for multipath volumes Summary: Storage driver plugin for multipath volumes
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: device-mapper Requires: device-mapper
%description daemon-driver-storage-mpath %description daemon-driver-storage-mpath
@ -679,6 +690,7 @@ multipath storage using device mapper.
%package daemon-driver-storage-gluster %package daemon-driver-storage-gluster
Summary: Storage driver plugin for gluster Summary: Storage driver plugin for gluster
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%if 0%{?fedora} %if 0%{?fedora}
Requires: glusterfs-client >= 2.0.1 Requires: glusterfs-client >= 2.0.1
%endif %endif
@ -696,6 +708,7 @@ volumes using libgfapi.
%package daemon-driver-storage-rbd %package daemon-driver-storage-rbd
Summary: Storage driver plugin for rbd Summary: Storage driver plugin for rbd
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-storage-rbd %description daemon-driver-storage-rbd
The storage driver backend adding implementation of the storage APIs for rbd The storage driver backend adding implementation of the storage APIs for rbd
@ -707,6 +720,7 @@ volumes using the ceph protocol.
%package daemon-driver-storage-sheepdog %package daemon-driver-storage-sheepdog
Summary: Storage driver plugin for sheepdog Summary: Storage driver plugin for sheepdog
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Requires: sheepdog Requires: sheepdog
%description daemon-driver-storage-sheepdog %description daemon-driver-storage-sheepdog
@ -719,6 +733,7 @@ sheepdog volumes using.
%package daemon-driver-storage-zfs %package daemon-driver-storage-zfs
Summary: Storage driver plugin for ZFS Summary: Storage driver plugin for ZFS
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
# Support any conforming implementation of zfs # Support any conforming implementation of zfs
Requires: /sbin/zfs Requires: /sbin/zfs
Requires: /sbin/zpool Requires: /sbin/zpool
@ -760,6 +775,7 @@ parted and more.
%package daemon-driver-qemu %package daemon-driver-qemu
Summary: QEMU driver plugin for the libvirtd daemon Summary: QEMU driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
# There really is a hard cross-driver dependency here # There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@ -784,6 +800,7 @@ QEMU
%package daemon-driver-lxc %package daemon-driver-lxc
Summary: LXC driver plugin for the libvirtd daemon Summary: LXC driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
# There really is a hard cross-driver dependency here # There really is a hard cross-driver dependency here
Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
@ -801,6 +818,7 @@ the Linux kernel
%package daemon-driver-uml %package daemon-driver-uml
Summary: Uml driver plugin for the libvirtd daemon Summary: Uml driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-uml %description daemon-driver-uml
The UML driver plugin for the libvirtd daemon, providing The UML driver plugin for the libvirtd daemon, providing
@ -813,6 +831,7 @@ User Mode Linux
%package daemon-driver-vbox %package daemon-driver-vbox
Summary: VirtualBox driver plugin for the libvirtd daemon Summary: VirtualBox driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
%description daemon-driver-vbox %description daemon-driver-vbox
The vbox driver plugin for the libvirtd daemon, providing The vbox driver plugin for the libvirtd daemon, providing
@ -825,6 +844,7 @@ VirtualBox
%package daemon-driver-libxl %package daemon-driver-libxl
Summary: Libxl driver plugin for the libvirtd daemon Summary: Libxl driver plugin for the libvirtd daemon
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
Obsoletes: libvirt-daemon-driver-xen < 4.3.0 Obsoletes: libvirt-daemon-driver-xen < 4.3.0
%description daemon-driver-libxl %description daemon-driver-libxl