[PATCH V8 05/13] spec: Rename the libvirt-lock-sanlock subpackage

[Jim Fehlig]

On 1/11/23 15:05, 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>
> Reviewed-by: Andrea Bolognani <abologna at redhat.com>
> ---
>   docs/kbase/rpm-deployment.rst | 12 ++++++------
>   libvirt.spec.in               | 11 ++++++-----
>   2 files changed, 12 insertions(+), 11 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 8277122bcb..56cf35ef06 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -962,15 +962,16 @@ 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}
> +Obsoletes: libvirt-lock-sanlock < 9.0.0

FYI, this has been changed to 9.1.0 in my local branch, which is available in my 
fork

https://gitlab.com/jfehlig/libvirt/-/tree/spec-modular-daemons-v2

Regards,
Jim

> +Provides: libvirt-lock-sanlock = %{version}-%{release}
>   
> -%description lock-sanlock
> +%description daemon-plugin-sanlock
>   Includes the Sanlock lock manager plugin for the QEMU
>   driver
>   %endif
> @@ -1829,7 +1830,6 @@ exit 0
>   %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
>   %dir %attr(0755, root, root) %{_libdir}/libvirt/
>   %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
> -%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
>   %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
>   %dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
>   %{_datadir}/augeas/lenses/libvirtd.aug
> @@ -2170,13 +2170,14 @@ exit 0
>   %endif
>   
>   %if %{with_sanlock}
> -%files lock-sanlock
> +%files daemon-plugin-sanlock
>       %if %{with_qemu}
>   %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
>       %endif
>       %if %{with_libxl}
>   %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
>       %endif
> +%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
>   %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
>   %{_datadir}/augeas/lenses/libvirt_sanlock.aug
>   %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug