diff --git a/libvirt.changes b/libvirt.changes index 6ad02b4..e753d71 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 22 19:05:39 UTC 2017 - olaf@aepfle.de + +- Replace hardcoded libvirt with Name tag when refering to subpkgs +- Remove dependencies to /bin/sh in libs and nss %post scripts + ------------------------------------------------------------------- Fri Nov 17 21:59:28 UTC 2017 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 480504f..a94722c 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -166,35 +166,35 @@ Summary: Library providing a simple virtualization API License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-config-network = %{version}-%{release} -Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-config-network = %{version}-%{release} +Requires: %{name}-daemon-config-nwfilter = %{version}-%{release} %if %{with_libxl} -Requires: libvirt-daemon-driver-libxl = %{version}-%{release} +Requires: %{name}-daemon-driver-libxl = %{version}-%{release} %endif %if %{with_lxc} -Requires: libvirt-daemon-driver-lxc = %{version}-%{release} +Requires: %{name}-daemon-driver-lxc = %{version}-%{release} %endif %if %{with_qemu} -Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +Requires: %{name}-daemon-driver-qemu = %{version}-%{release} %endif %if %{with_uml} -Requires: libvirt-daemon-driver-uml = %{version}-%{release} +Requires: %{name}-daemon-driver-uml = %{version}-%{release} %endif %if %{with_xen} -Requires: libvirt-daemon-driver-xen = %{version}-%{release} +Requires: %{name}-daemon-driver-xen = %{version}-%{release} %endif %if %{with_vbox} -Requires: libvirt-daemon-driver-vbox = %{version}-%{release} +Requires: %{name}-daemon-driver-vbox = %{version}-%{release} %endif -Requires: libvirt-client = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -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} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # All build-time requirements. Run-time requirements are # listed against each sub-RPM @@ -398,8 +398,8 @@ for specific drivers. Summary: Default configuration files for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} %description daemon-config-network Default configuration files for setting up NAT based networking @@ -408,8 +408,8 @@ Default configuration files for setting up NAT based networking Summary: Network filter configuration files for the libvirtd Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} %description daemon-config-nwfilter Network filter configuration files for the libvirt daemon, used for @@ -421,7 +421,7 @@ Group: Development/Libraries/C and C++ Requires: dnsmasq >= 2.41 Requires: iptables # TODO Requires: iptables-ipv6 -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} Requires: radvd %description daemon-driver-network @@ -435,7 +435,7 @@ Group: Development/Libraries/C and C++ Requires: ebtables Requires: iptables # TODO Requires: iptables-ipv6 -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-nwfilter The nwfilter driver plugin for the libvirtd daemon, providing @@ -445,7 +445,7 @@ iptables and ip6tables capabilities %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-nodedev The nodedev driver plugin for the libvirtd daemon, providing @@ -455,7 +455,7 @@ capabilities. %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-interface The interface driver plugin for the libvirtd daemon, providing @@ -465,7 +465,7 @@ netcontrol library %package daemon-driver-secret Summary: Secret driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-secret The secret driver plugin for the libvirtd daemon, providing @@ -474,7 +474,7 @@ an implementation of the secret key APIs. %package daemon-driver-storage-core Summary: Storage driver plugin including base backends for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} Requires: nfs-utils # For mkfs Requires: util-linux @@ -491,7 +491,7 @@ iSCSI, and multipath storage. %package daemon-driver-storage-logical Summary: Storage driver plugin for lvm volumes Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: lvm2 %description daemon-driver-storage-logical @@ -501,8 +501,8 @@ volumes using lvm. %package daemon-driver-storage-disk Summary: Storage driver plugin for disk Group: Development/Libraries/C and C++ +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: device-mapper -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: parted %description daemon-driver-storage-disk @@ -512,7 +512,7 @@ volumes using the host disks. %package daemon-driver-storage-scsi Summary: Storage driver plugin for local scsi devices Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} %description daemon-driver-storage-scsi The storage driver backend adding implementation of the storage APIs for scsi @@ -521,7 +521,7 @@ host devices. %package daemon-driver-storage-iscsi Summary: Storage driver plugin for iscsi Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: open-iscsi %description daemon-driver-storage-iscsi @@ -531,8 +531,8 @@ volumes using the host iscsi stack. %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes Group: Development/Libraries/C and C++ +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: device-mapper -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} %description daemon-driver-storage-mpath The storage driver backend adding implementation of the storage APIs for @@ -543,7 +543,7 @@ multipath storage using device mapper. %package daemon-driver-storage-gluster Summary: Storage driver plugin for gluster Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} %description daemon-driver-storage-gluster The storage driver backend adding implementation of the storage APIs for gluster @@ -554,7 +554,7 @@ volumes using libgfapi. %package daemon-driver-storage-rbd Summary: Storage driver plugin for rbd Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} %description daemon-driver-storage-rbd The storage driver backend adding implementation of the storage APIs for rbd @@ -565,7 +565,7 @@ volumes using the ceph protocol. %package daemon-driver-storage-sheepdog Summary: Storage driver plugin for sheepdog Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: sheepdog %description daemon-driver-storage-sheepdog @@ -576,20 +576,20 @@ sheepdog volumes using. %package daemon-driver-storage Summary: Storage driver plugin including all backends for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-disk = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-logical = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-mpath = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-scsi = %{version}-%{release} %if %{with_storage_gluster} -Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-gluster = %{version}-%{release} %endif %if %{with_storage_rbd} -Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-rbd = %{version}-%{release} %endif %if %{with_storage_sheepdog} -Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-sheepdog = %{version}-%{release} %endif %description daemon-driver-storage @@ -602,11 +602,11 @@ parted and more. %package daemon-driver-qemu Summary: Qemu driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} Requires: /usr/bin/qemu-img -Requires: libvirt-daemon-driver-network = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} # For image compression Requires: bzip2 Requires: gzip @@ -624,9 +624,9 @@ an implementation of the hypervisor driver APIs using QEMU. %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here -Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} %description daemon-driver-lxc The LXC driver plugin for the libvirtd daemon, providing @@ -639,7 +639,7 @@ the Linux kernel %package daemon-driver-uml Summary: Uml driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-uml The UML driver plugin for the libvirtd daemon, providing @@ -652,7 +652,7 @@ User Mode Linux %package daemon-driver-xen Summary: Xen driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-xen The Xen driver plugin for the libvirtd daemon, providing @@ -664,7 +664,7 @@ an implementation of the hypervisor driver APIs using Xen. %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-vbox The vbox driver plugin for the libvirtd daemon, providing @@ -677,7 +677,7 @@ VirtualBox %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing @@ -690,14 +690,14 @@ an implementation of the hypervisor driver APIs using libxl. Summary: Server side daemon & driver required to run QEMU guests Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} -Requires: libvirt-daemon-driver-qemu = %{version}-%{release} -Requires: libvirt-daemon-driver-secret = %{version}-%{release} -Requires: libvirt-daemon-driver-storage = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-qemu = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} %description daemon-qemu Server side daemon and driver required to manage the virtualization @@ -710,14 +710,14 @@ capabilities of the QEMU emulators Summary: Server side daemon & driver required to run LXC guests Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-lxc = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -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} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-lxc = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} %description daemon-lxc Server side daemon and driver required to manage the virtualization @@ -730,14 +730,14 @@ capabilities of LXC Summary: Server side daemon & driver required to run UML guests Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -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} -Requires: libvirt-daemon-driver-uml = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} +Requires: %{name}-daemon-driver-uml = %{version}-%{release} %description daemon-uml Server side daemon and driver required to manage the virtualization @@ -750,19 +750,19 @@ capabilities of UML Summary: Server side daemon & driver required to run XEN guests Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} %if %{with_xen} -Requires: libvirt-daemon-driver-xen = %{version}-%{release} +Requires: %{name}-daemon-driver-xen = %{version}-%{release} %endif %if %{with_libxl} -Requires: libvirt-daemon-driver-libxl = %{version}-%{release} +Requires: %{name}-daemon-driver-libxl = %{version}-%{release} %endif -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -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} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} Requires: xen %description daemon-xen @@ -775,14 +775,14 @@ capabilities of XEN %package daemon-vbox Summary: Server side daemon & driver required to run VirtualBox guests Group: Development/Libraries/C and C++ -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -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} -Requires: libvirt-daemon-driver-vbox = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} +Requires: %{name}-daemon-driver-vbox = %{version}-%{release} # Specify supported virtualbox API explicitly. See ./src/vbox # Reference bsc#1017189 Requires: virtualbox < 5.2 @@ -871,7 +871,7 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %package nss Summary: Libvirt plugin for Name Service Switch Group: Development/Libraries/C and C++ -Requires: libvirt-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} %description nss libvirt plugin for NSS for translating domain names into IP addresses. @@ -1290,7 +1290,7 @@ fi # sockets, if libvirtd is already enabled and start them if # libvirtd is running, otherwise you'll get failures to start # guests -%triggerpostun daemon -- libvirt-daemon < 1.3.0 +%triggerpostun daemon -- %{name}-daemon < 1.3.0 if [ $1 -ge 1 ] ; then /usr/bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 && /usr/bin/systemctl enable virtlogd.socket || : @@ -1323,17 +1323,13 @@ fi %postun client %service_del_postun libvirt-guests.service -%post libs -/sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun libs -/sbin/ldconfig +%postun libs -p /sbin/ldconfig -%post nss -/sbin/ldconfig +%post nss -p /sbin/ldconfig -%postun nss -/sbin/ldconfig +%postun nss -p /sbin/ldconfig %files %doc %{_docdir}/%{name}/libvirt.README