Re: [libvirt PATCH] spec: Merge -bash-completion and -admin into -client

On 4/15/21 11:20 AM, Andrea Bolognani wrote: > The former is ridiculously tiny and doesn't have any use on > its own, so it hardly warrants the overhead of an additional > package; the latter is also very small and, just like virsh, > is something that you likely want to have available on any > virtualization host to help with management and debugging > tasks. > > Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; > --- > libvirt.spec.in | 28 ++++------------------------ > 1 file changed, 4 insertions(+), 24 deletions(-) > > diff --git a/libvirt.spec.in b/libvirt.spec.in > index f9af330186..80a12a307a 100644 > --- a/libvirt.spec.in > +++ b/libvirt.spec.in > @@ -901,7 +901,6 @@ Requires: %{name}-libs = %{version}-%{release} > Requires: gettext > # Needed by virt-pki-validate script. > Requires: gnutls-utils > -Requires: %{name}-bash-completion = %{version}-%{release} > %description client > The client binaries needed to access the virtualization > @@ -918,20 +917,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 > - > -%description bash-completion > -Bash completion script stub. > - > %if %{with_wireshark} > %package wireshark > Summary: Wireshark dissector plugin for libvirt RPC transactions > @@ -1872,10 +1857,12 @@ exit 0 > %files client > %{_mandir}/man1/virsh.1* > +%{_mandir}/man1/virt-admin.1* > %{_mandir}/man1/virt-xml-validate.1* > %{_mandir}/man1/virt-pki-validate.1* > %{_mandir}/man1/virt-host-validate.1* > %{_bindir}/virsh > +%{_bindir}/virt-admin > %{_bindir}/virt-xml-validate > %{_bindir}/virt-pki-validate > %{_bindir}/virt-host-validate > @@ -1886,8 +1873,9 @@ exit 0 > %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp > %endif > +%{_datadir}/bash-completion/completions/vsh > %{_datadir}/bash-completion/completions/virsh > - > +%{_datadir}/bash-completion/completions/virt-admin > %{_unitdir}/libvirt-guests.service > %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests > @@ -1911,14 +1899,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 > - > %if %{with_wireshark} > %files wireshark > %{wireshark_plugindir}/libvirt.so > The -client package needs then to obsolete those packages which you're removing. Loo around at "Obsoletes:" tag we have around.

However, I'm not sure that virt-admin should go to client package. For instance, I can install -client to control remote daemon but virt-admin works only locally (because we want it to). Therefore, if anything, it should go in the same package as libvirtd. But taking split daemons into account - any of them should drag in virt-admin.