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

[Daniel P. Berrangé]

On Thu, Apr 15, 2021 at 02:52:28PM +0200, 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 at redhat.com>
> ---
> Changes from [v1]:
> 
>   * add Obsoletes/Provides for a smooth transition.
> 
> [v1] https://listman.redhat.com/archives/libvir-list/2021-April/msg00604.html
> 
>  libvirt.spec.in | 34 ++++++++++------------------------
>  1 file changed, 10 insertions(+), 24 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index f9af330186..a90f6abe38 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -901,7 +901,12 @@ Requires: %{name}-libs = %{version}-%{release}
>  Requires: gettext
>  # Needed by virt-pki-validate script.
>  Requires: gnutls-utils
> -Requires: %{name}-bash-completion = %{version}-%{release}
> +# The -admin and -bash-completion packages have been merged into
> +# the -client package: ensure this change is handled smoothly
> +Obsoletes: libvirt-admin < 7.3.0
> +Obsoletes: libvirt-bash-completion < 7.3.0
> +Provides: libvirt-admin
> +Provides: libvirt-bash-completion
>  
>  %description client
>  The client binaries needed to access the virtualization
> @@ -918,20 +923,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 +1863,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

Per discussion on the previous version though, we better to have
installed any time the daemon is installed, and so if we do that
it means we also want the bash completion separate from the client.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|