Reinstate lvm2-lockd on all architectures as sanlock package is fixed now.

This commit is contained in:
Peter Rajnoha 2016-02-24 10:48:20 +01:00
parent 25f0e59ea0
commit 083040f8df

View File

@ -22,11 +22,7 @@
%global persistent_data_version 0.5.5-1
%global sanlock_version 3.2.4-1
%ifnarch x86_64 aarch64 %{power64}
%global enable_lockd_sanlock 0
%else
%global enable_lockd_sanlock %{enable_lvmlockd}
%endif
%global enable_lockd_dlm %{enable_lvmlockd}
%if 0%{?rhel}
@ -57,7 +53,7 @@ Summary: Userland logical volume management tools
Name: lvm2
Version: 2.02.143
Release: 3%{?dist}
Release: 4%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://sources.redhat.com/lvm2
@ -497,7 +493,9 @@ Requires: lvm2 = %{version}-%{release}
%if %{enable_lockd_sanlock}
Requires: sanlock-lib >= %{sanlock_version}
%endif
%if %{enable_lockd_dlm}
Requires: dlm >= %{dlm_version}
%endif
Requires(post): systemd-units >= %{systemd_version}
Requires(preun): systemd-units >= %{systemd_version}
Requires(postun): systemd-units >= %{systemd_version}
@ -840,6 +838,9 @@ the device-mapper event library.
%{_libdir}/pkgconfig/devmapper-event.pc
%changelog
* Wed Feb 24 2016 Peter Rajnoha <prajnoha@redhat.com> - 2.02.143-4
- Reinstate lvm2-lockd on all architectures as sanlock package is fixed now.
* Tue Feb 23 2016 Peter Rajnoha <prajnoha@redhat.com> - 2.02.143-3
- Remove Requires: sanlock-lib for lvm2-lockd subpackage if sanlock not compiled.