[PATCH RFC 2/6] spec: Use more %{name} macro

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com&gt; --- libvirt.spec.in | 250 ++++++++++++++++++++++++------------------------ 1 file changed, 125 insertions(+), 125 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 277ecd3eb3..3c9975b684 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -239,33 +239,33 @@ URL: https://libvirt.org/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -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 # We had UML driver, but we've removed it. -Obsoletes: libvirt-daemon-driver-uml <= 5.0.0 -Obsoletes: libvirt-daemon-uml <= 5.0.0 +Obsoletes: %{name}-daemon-driver-uml <= 5.0.0 +Obsoletes: %{name}-daemon-uml <= 5.0.0 %if %{with_vbox} -Requires: libvirt-daemon-driver-vbox = %{version}-%{release} +Requires: %{name}-daemon-driver-vbox = %{version}-%{release} %endif -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} +Requires: %{name}-daemon-driver-nwfilter = %{version}-%{release} -Requires: libvirt-daemon-driver-interface = %{version}-%{release} -Requires: libvirt-daemon-driver-secret = %{version}-%{release} -Requires: libvirt-daemon-driver-storage = %{version}-%{release} -Requires: libvirt-daemon-driver-network = %{version}-%{release} -Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-client = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-interface = %{version}-%{release} +Requires: %{name}-daemon-driver-secret = %{version}-%{release} +Requires: %{name}-daemon-driver-storage = %{version}-%{release} +Requires: %{name}-daemon-driver-network = %{version}-%{release} +Requires: %{name}-daemon-driver-nodedev = %{version}-%{release} +Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # All build-time requirements. Run-time requirements are # listed against each sub-RPM @@ -484,9 +484,9 @@ Requires: gettext %endif # Ensure smooth upgrades -Obsoletes: libvirt-admin < 7.3.0 -Provides: libvirt-admin = %{version}-%{release} -Obsoletes: libvirt-bash-completion < 7.3.0 +Obsoletes: %{name}-admin < 7.3.0 +Provides: %{name}-admin = %{version}-%{release} +Obsoletes: %{name}-bash-completion < 7.3.0 %description daemon Server side daemon required to manage the virtualization capabilities @@ -496,8 +496,8 @@ for specific drivers. %package daemon-config-network Summary: Default configuration files for the libvirtd daemon -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 @@ -505,16 +505,16 @@ Default configuration files for setting up NAT based networking %package daemon-config-nwfilter Summary: Network filter configuration files for the libvirtd daemon -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 cleaning guest traffic %package daemon-driver-network Summary: Network driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: iptables @@ -526,8 +526,8 @@ bridge capabilities. %package daemon-driver-nwfilter Summary: Nwfilter driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: iptables Requires: ebtables @@ -539,8 +539,8 @@ iptables and ip6tables capabilities %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # needed for device enumeration Requires: systemd >= 185 # For managing persistent mediated devices @@ -554,8 +554,8 @@ capabilities. %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %if %{with_netcf} Requires: netcf-libs >= 0.2.2 %endif @@ -566,8 +566,8 @@ an implementation of the host network interface APIs. %package daemon-driver-secret Summary: Secret driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-secret The secret driver plugin for the libvirtd daemon, providing @@ -575,8 +575,8 @@ an implementation of the secret key APIs. %package daemon-driver-storage-core Summary: Storage driver plugin including base backends for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: nfs-utils # For mkfs Requires: util-linux @@ -585,9 +585,9 @@ Requires: util-linux Requires: /usr/bin/qemu-img %endif %if !%{with_storage_rbd} -Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 +Obsoletes: %{name}-daemon-driver-storage-rbd < 5.2.0 %endif -Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 +Obsoletes: %{name}-daemon-driver-storage-sheepdog < 8.8.0 %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -596,8 +596,8 @@ iSCSI, and multipath storage. %package daemon-driver-storage-logical Summary: Storage driver plugin for lvm volumes -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: lvm2 %description daemon-driver-storage-logical @@ -607,8 +607,8 @@ volumes using lvm. %package daemon-driver-storage-disk Summary: Storage driver plugin for disk -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: parted Requires: device-mapper @@ -619,8 +619,8 @@ volumes using the host disks. %package daemon-driver-storage-scsi Summary: Storage driver plugin for local scsi devices -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-scsi The storage driver backend adding implementation of the storage APIs for scsi @@ -629,8 +629,8 @@ host devices. %package daemon-driver-storage-iscsi Summary: Storage driver plugin for iscsi -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: iscsi-initiator-utils %description daemon-driver-storage-iscsi @@ -641,8 +641,8 @@ volumes using the host iscsi stack. %if %{with_storage_iscsi_direct} %package daemon-driver-storage-iscsi-direct Summary: Storage driver plugin for iscsi-direct -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-iscsi-direct The storage driver backend adding implementation of the storage APIs for iscsi @@ -652,8 +652,8 @@ volumes using libiscsi direct connection. %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: device-mapper %description daemon-driver-storage-mpath @@ -664,8 +664,8 @@ multipath storage using device mapper. %if %{with_storage_gluster} %package daemon-driver-storage-gluster Summary: Storage driver plugin for gluster -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %if 0%{?fedora} Requires: glusterfs-client >= 2.0.1 %endif @@ -682,8 +682,8 @@ volumes using libgfapi. %if %{with_storage_rbd} %package daemon-driver-storage-rbd Summary: Storage driver plugin for rbd -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-storage-rbd The storage driver backend adding implementation of the storage APIs for rbd @@ -694,8 +694,8 @@ volumes using the ceph protocol. %if %{with_storage_zfs} %package daemon-driver-storage-zfs Summary: Storage driver plugin for ZFS -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} # Support any conforming implementation of zfs Requires: /sbin/zfs Requires: /sbin/zpool @@ -708,23 +708,23 @@ ZFS volumes. %package daemon-driver-storage Summary: Storage driver plugin including all backends for the libvirtd daemon -Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-core = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-disk = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-logical = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-scsi = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-mpath = %{version}-%{release} %if %{with_storage_iscsi_direct} -Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-iscsi-direct = %{version}-%{release} %endif %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_zfs} -Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release} +Requires: %{name}-daemon-driver-storage-zfs = %{version}-%{release} %endif %description daemon-driver-storage @@ -736,8 +736,8 @@ parted and more. %if %{with_qemu} %package daemon-driver-qemu Summary: QEMU driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Requires: /usr/bin/qemu-img # For image compression Requires: gzip @@ -757,10 +757,10 @@ QEMU %if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{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} Requires: systemd-container %description daemon-driver-lxc @@ -773,8 +773,8 @@ the Linux kernel %if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description daemon-driver-vbox The vbox driver plugin for the libvirtd daemon, providing @@ -786,9 +786,9 @@ VirtualBox %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-libs = %{version}-%{release} -Obsoletes: libvirt-daemon-driver-xen < 4.3.0 +Requires: %{name}-daemon = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} +Obsoletes: %{name}-daemon-driver-xen < 4.3.0 %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing @@ -802,14 +802,14 @@ Libxl %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-qemu = %{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: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-qemu = %{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: qemu %description daemon-qemu @@ -822,14 +822,14 @@ capabilities of the QEMU TCG emulators %package daemon-kvm Summary: Server side daemon & driver required to run KVM guests -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-qemu = %{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: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-qemu = %{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: qemu-kvm %description daemon-kvm @@ -842,14 +842,14 @@ 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-driver-lxc = %{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: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-lxc = %{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} %description daemon-lxc Server side daemon and driver required to manage the virtualization @@ -861,14 +861,14 @@ capabilities of LXC %package daemon-xen Summary: Server side daemon & driver required to run XEN guests -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-libxl = %{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: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-libxl = %{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 @@ -880,14 +880,14 @@ capabilities of XEN %package daemon-vbox Summary: Server side daemon & driver required to run VirtualBox guests -Requires: libvirt-daemon = %{version}-%{release} -Requires: libvirt-daemon-driver-vbox = %{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: %{name}-daemon = %{version}-%{release} +Requires: %{name}-daemon-driver-vbox = %{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} %description daemon-vbox Server side daemon and driver required to manage the virtualization @@ -901,7 +901,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: gnutls-utils # Ensure smooth upgrades -Obsoletes: libvirt-bash-completion < 7.3.0 +Obsoletes: %{name}-bash-completion < 7.3.0 %description client The client binaries needed to access the virtualization @@ -910,7 +910,7 @@ capabilities of recent versions of Linux (and other OSes). %package client-qemu Summary: Additional client side utilities for QEMU Requires: %{name}-libs = %{version}-%{release} -Requires: python3-libvirt >= 3.7.0 +Requires: python3-%{name} >= 3.7.0 %description client-qemu The additional client binaries are used to interact @@ -972,26 +972,26 @@ driver %package nss Summary: Libvirt plugin for Name Service Switch -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. %if %{with_mingw} -%package -n mingw32-libvirt +%package -n mingw32-%{name} Summary: %{summary} -Obsoletes: mingw32-libvirt-static < 7.0.0 +Obsoletes: mingw32-%{name}-static < 7.0.0 BuildArch: noarch -%description -n mingw32-libvirt +%description -n mingw32-%{name} MinGW Windows libvirt virtualization library. -%package -n mingw64-libvirt +%package -n mingw64-%{name} Summary: %{summary} -Obsoletes: mingw64-libvirt-static < 7.0.0 +Obsoletes: mingw64-%{name}-static < 7.0.0 BuildArch: noarch -%description -n mingw64-libvirt +%description -n mingw64-%{name} MinGW Windows libvirt virtualization library. %{?mingw_debug_package} -- 2.37.3