[PATCH V3 05/11] spec: Rename the libvirt-lock-sanlock subpackage

[Daniel P. Berrangé]

On Tue, Dec 20, 2022 at 02:26:21PM -0700, Jim Fehlig wrote:
> The new name "libvirt-daemon-plugin-sanlock" provides consistency with the
> newly introduced "libvirt-daemon-plugin-lockd" subpackage.
> 
> It's also a good opportunity to taking ownership of
> %{_libdir}/libvirt/lock-driver/, removing the need for a dependency on the
> libvirt-daemon package.
> 
> Signed-off-by: Jim Fehlig <jfehlig at suse.com>
> ---
>  docs/kbase/rpm-deployment.rst | 12 ++++++------
>  libvirt.spec.in               | 11 +++++++----
>  2 files changed, 13 insertions(+), 10 deletions(-)
> 
> diff --git a/docs/kbase/rpm-deployment.rst b/docs/kbase/rpm-deployment.rst
> index 31805c2280..7685ee1291 100644
> --- a/docs/kbase/rpm-deployment.rst
> +++ b/docs/kbase/rpm-deployment.rst
> @@ -289,6 +289,12 @@ RPM packages
>    features, the subset of libvirt-daemon-driver-XXX packages should be used
>    instead.
>  
> +* libvirt-daemon-plugin-sanlock
> +
> +  This package provides the sanlock.so module, a daemon plugin that implements
> +  disk locking via communication with the sanlock daemon. It is optional and
> +  only relevant to hosts with the QEMU driver and oVirt management application.
> +
>  * libvirt-daemon-qemu
>  
>    This is an empty package that exists only as a convenient way to request
> @@ -352,12 +358,6 @@ RPM packages
>    take to the libvirt daemons to utilize stateful drivers (QEMU, Xen, BHyve,
>    LXC, VZ, etc). This is needed on all libvirt hosts, both client and server.
>  
> -* libvirt-lock-sanlock
> -
> -  A plugin for locking disks that communicates with the sanlock daemon. It is
> -  optional and only relevant to hosts with the QEMU driver and oVirt management
> -  application.
> -
>  * libvirt-login-shell
>  
>    A simple login shell that automatically spawns an LXC container for the user
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index cb4a6e8736..cc445df83b 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -956,15 +956,18 @@ Requires: pkgconfig
>  Include header files & development libraries for the libvirt C library.
>  
>  %if %{with_sanlock}
> -%package lock-sanlock
> +%package daemon-plugin-sanlock
>  Summary: Sanlock lock manager plugin for QEMU driver
>  Requires: sanlock >= 2.4
>  #for virt-sanlock-cleanup require augeas
>  Requires: augeas
>  Requires: libvirt-daemon = %{version}-%{release}
>  Requires: libvirt-libs = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}

Sanlock shold not depend on virtlockd

> +Obsoletes: libvirt-lock-sanlock < 9.0.0
> +Provides: libvirt-lock-sanlock = %{version}-%{release}

With 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 :|