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@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst
index 2563142a50697b9e74de7b4b0ee6465cd94dfb85..cc2a4eb28883337e2bb374a0ef6fb665642d4805 100644 (file)
--- 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 be74964b7b53b7ee2321b93b362cb3ae7ccf8f2d..3a3e3f69ead34125aa3365c9bdfef51d73f2d0c4 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -434,6 +434,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
 
@@ -465,6 +468,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
@@ -922,14 +929,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
 
@@ -1593,12 +1592,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
@@ -1915,11 +1918,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