[v2] spec: Decompose the daemon subpackage

[PATCH V2 5/9] spec: Rename the libvirt-lock-sanlock subpackage

Posted by Jim Fehlig 3 years, 1 month ago

The new name "libvirt-daemon-plugin-sanlock" provides consistency with the
newly introduced "libvirt-daemon-plugin-lockd" subpackage.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
---
 libvirt.spec.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 63b29ba6f4..8aa8ff6516 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -954,14 +954,17 @@ 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-libs = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+Obsoletes: libvirt-lock-sanlock < 8.10.0
+Provides: libvirt-lock-sanlock = %{version}-%{release}
 
-%description lock-sanlock
+%description daemon-plugin-sanlock
 Includes the Sanlock lock manager plugin for the QEMU
 driver
 %endif
@@ -2156,7 +2159,7 @@ exit 0
 %endif
 
 %if %{with_sanlock}
-%files lock-sanlock
+%files daemon-plugin-sanlock
     %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
     %endif
-- 
2.38.1

Re: [PATCH V2 5/9] spec: Rename the libvirt-lock-sanlock subpackage

Posted by Daniel P. Berrangé 3 years, 1 month ago

On Tue, Dec 13, 2022 at 05:30:58PM -0700, Jim Fehlig wrote:
> The new name "libvirt-daemon-plugin-sanlock" provides consistency with the
> newly introduced "libvirt-daemon-plugin-lockd" subpackage.
> 
> Signed-off-by: Jim Fehlig <jfehlig@suse.com>
> ---
>  libvirt.spec.in | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 63b29ba6f4..8aa8ff6516 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -954,14 +954,17 @@ 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-libs = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}

The sanlock plugin has no dependancy on virtlockd, so we should not
require that to be installed.


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

Re: [PATCH V2 5/9] spec: Rename the libvirt-lock-sanlock subpackage

Posted by Andrea Bolognani 3 years, 1 month ago

On Tue, Dec 13, 2022 at 05:30:58PM -0700, Jim Fehlig wrote:
> +%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-libs = %{version}-%{release}
> +Requires: libvirt-daemon-lock = %{version}-%{release}
> +Obsoletes: libvirt-lock-sanlock < 8.10.0

The version number should be 9.0.0 here.

-- 
Andrea Bolognani / Red Hat / Virtualization