[packages/lvm2] really separate lockd

atler atler at pld-linux.org
Sun Jul 14 14:50:19 CEST 2024


commit a1e7522c8d3b7d4c416a4377b45121ef6d838fcc
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jul 14 13:54:15 2024 +0200

    really separate lockd
    
    e2727f8 intended to do it but final step of separating %files was missed

 lvm2.spec | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/lvm2.spec b/lvm2.spec
index 9eafbbf..476ae69 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -81,6 +81,7 @@ Requires:	device-mapper >= %{version}-%{release}
 Requires:	systemd-units >= 38
 # doesn't work with 2.4 kernels
 Requires:	uname(release) >= 2.6
+%{?with_lvmlockd:Suggests:	%{name}-lockd = %{version}-%{release}}
 Suggests:	thin-provisioning-tools >= 0.7.0
 Obsoletes:	lvm < 2
 Obsoletes:	lvm2-clvmd < 2.03
@@ -642,14 +643,6 @@ fi
 %attr(700,root,root) %dir /run/lvm
 %attr(700,root,root) %dir /var/lock/lvm
 %attr(700,root,root) %dir /var/lock/lvm/subsys
-%if %{with lvmlockd}
-%attr(755,root,root) %{_sbindir}/lvmlockctl
-%attr(755,root,root) %{_sbindir}/lvmlockd
-%{systemdunitdir}/lvmlockd.service
-%{systemdunitdir}/lvmlocks.service
-%{_mandir}/man8/lvmlockctl.8*
-%{_mandir}/man8/lvmlockd.8*
-%endif
 %if %{with lvmpolld}
 %attr(755,root,root) %{_sbindir}/lvmpolld
 %attr(754,root,root) /etc/rc.d/init.d/lvm2-lvmpolld
@@ -679,6 +672,17 @@ fi
 %{_mandir}/man8/lvmdbusd.8*
 %endif
 
+%if %{with lvmlockd}
+%files lockd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/lvmlockctl
+%attr(755,root,root) %{_sbindir}/lvmlockd
+%{systemdunitdir}/lvmlockd.service
+%{systemdunitdir}/lvmlocks.service
+%{_mandir}/man8/lvmlockctl.8*
+%{_mandir}/man8/lvmlockd.8*
+%endif
+
 %files resource-agents
 %defattr(644,root,root,755)
 %dir %{_prefix}/lib/ocf/resource.d/lvm2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lvm2.git/commitdiff/736d75bea814874e6425d825b40ba63018f93473



More information about the pld-cvs-commit mailing list