[libvirt PATCH v4 3/7] spec: Merge -admin package into -daemon

It's useful to have virt-admin around when debugging issues with libvirtd, and since it's a tiny binary we can simply include it in the -daemon package to ensure it's always going to be available when needed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- docs/kbase/rpm-deployment.rst | 12 +++++------- libvirt.spec.in | 24 +++++++++++------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst index 2563142a50..cc2a4eb288 100644 --- a/docs/kbase/rpm-deployment.rst +++ b/docs/kbase/rpm-deployment.rst @@ -27,13 +27,6 @@ RPM packages every other libvirt RPM package. Almost every deployment scenario would be better served by picking one of the other RPMs listed below. -* libvirt-admin - - The virt-admin tool, used for administrative operations on any libvirt - daemons. Most usefully it allows for logging filters and outputs to be - reconfigured on a running daemon without a restart. This is recommended - to be installed on any host running a libvirt daemon. - * libvirt-bash-completion Argument auto-completion support for the Bash shell. This is shared code that @@ -57,6 +50,11 @@ RPM packages virtlockd and virtproxyd daemons, plus a number of helpers, configuration files and other bits necessary to create and admin a virtualization host. + The virt-admin tool, also included in this package, is used for + administrative operations on any libvirt daemons. Most usefully it allows + for logging filters and outputs to be reconfigured on a running daemon + without a restart. + * libvirt-daemon-config-network The sample configuration file providing the 'default' virtual network that diff --git a/libvirt.spec.in b/libvirt.spec.in index f9af330186..db88b1bf3d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -430,6 +430,9 @@ Summary: Server side daemon and supporting files for libvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs = %{version}-%{release} +# bash completion support for virt-admin +Requires: %{name}-bash-completion = %{version}-%{release} + # (client invokes 'nc' against the UNIX socket on the server) Requires: /usr/bin/nc @@ -461,6 +464,10 @@ Requires: dbus # For uid creation during pre Requires(pre): shadow-utils +# Ensure smooth upgrades +Obsoletes: libvirt-admin < 7.3.0 +Provides: libvirt-admin + %description daemon Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM @@ -918,14 +925,6 @@ Requires: cyrus-sasl-gssapi %description libs Shared libraries for accessing the libvirt daemon. -%package admin -Summary: Set of tools to control libvirt daemon -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-bash-completion = %{version}-%{release} - -%description admin -The client side utilities to control the libvirt daemon. - %package bash-completion Summary: Bash completion script @@ -1589,12 +1588,16 @@ exit 0 %attr(0755, root, root) %{_sbindir}/virtlogd %attr(0755, root, root) %{_sbindir}/virtlockd +%{_mandir}/man1/virt-admin.1* %{_mandir}/man8/libvirtd.8* %{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtproxyd.8* %{_mandir}/man7/virkey*.7* +%{_bindir}/virt-admin +%{_datadir}/bash-completion/completions/virt-admin + %files daemon-config-network %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml @@ -1911,11 +1914,6 @@ exit 0 %{_datadir}/libvirt/test-screenshot.png -%files admin -%{_mandir}/man1/virt-admin.1* -%{_bindir}/virt-admin -%{_datadir}/bash-completion/completions/virt-admin - %files bash-completion %{_datadir}/bash-completion/completions/vsh -- 2.26.3