shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

spec: rename lockd to lvmlockd

Browse Source
This commit is contained in:
David Teigland 2017-04-18 11:22:07 -05:00
parent a41a8430d6
commit a5256d1353
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/build.inc
View File

@ -27,8 +27,8 @@
%enableif %{enable_lvmpolld} lvmpolld %enableif %{enable_lvmpolld} lvmpolld
%global enable_lvmlockd %(if echo %{services} | grep -q lvmlockd; then echo 1; else echo 0; fi) %global enable_lvmlockd %(if echo %{services} | grep -q lvmlockd; then echo 1; else echo 0; fi)
%if %{enable_lvmlockd} %if %{enable_lvmlockd}
%enableif %{enable_lockd_dlm} lockd-dlm %enableif %{enable_lvmlockd_dlm} lvmlockd-dlm
%enableif %{enable_lockd_sanlock} lockd-sanlock %enableif %{enable_lvmlockd_sanlock} lvmlockd-sanlock
%endif %endif
%enableif %{enable_python} python2-bindings %enableif %{enable_python} python2-bindings
%enableif %{enable_python3} python3-bindings %enableif %{enable_python3} python3-bindings

4
spec/packages.inc
View File

@ -275,10 +275,10 @@ This package contains shared lvm2 libraries for applications.
Summary: LVM locking daemon Summary: LVM locking daemon
Group: System Environment/Base Group: System Environment/Base
Requires: lvm2 = %{version}-%{release} Requires: lvm2 = %{version}-%{release}
%if %{enable_lockd_dlm} %if %{enable_lvmlockd_dlm}
Requires: dlm-lib >= %{dlm_version} Requires: dlm-lib >= %{dlm_version}
%endif %endif
%if %{enable_lockd_sanlock} %if %{enable_lvmlockd_sanlock}
Requires: sanlock-lib >= %{sanlock_version} Requires: sanlock-lib >= %{sanlock_version}
%endif %endif
Requires(post): systemd-units Requires(post): systemd-units

22
spec/source.inc
View File

@ -16,8 +16,8 @@
%global enable_lvmetad 1 %global enable_lvmetad 1
%global enable_lvmpolld 1 %global enable_lvmpolld 1
%global enable_dmfilemapd 0 %global enable_dmfilemapd 0
#%global enable_lockd_dlm 0 #%global enable_lvmlockd_dlm 0
#%global enable_lockd_sanlock 0 #%global enable_lvmlockd_sanlock 0
%if %{enable_udev} %if %{enable_udev}
%service lvmetad 1 %service lvmetad 1
@ -52,24 +52,24 @@
%if %{fedora} >= 24 || %{rhel} >= 7 %if %{fedora} >= 24 || %{rhel} >= 7
%service lvmlockd 1 %service lvmlockd 1
%global sanlock_version 3.3.0-1 %global sanlock_version 3.3.0-1
%global enable_lockd_dlm 1 %global enable_lvmlockd_dlm 1
%global enable_lockd_sanlock 1 %global enable_lvmlockd_sanlock 1
%if %{rhel} %if %{rhel}
%ifarch i686 x86_64 s390x %ifarch i686 x86_64 s390x
%global buildreq_lockd_dlm dlm-devel >= %{dlm_version} %global buildreq_lvmlockd_dlm dlm-devel >= %{dlm_version}
%else %else
%global enable_lockd_dlm 0 %global enable_lvmlockd_dlm 0
%endif %endif
%ifarch x86_64 ppc64le ppc64 aarch64 %ifarch x86_64 ppc64le ppc64 aarch64
%global buildreq_lockd_sanlock sanlock-devel >= %{sanlock_version} %global buildreq_lvmlockd_sanlock sanlock-devel >= %{sanlock_version}
%else %else
%global enable_lockd_sanlock 0 %global enable_lvmlockd_sanlock 0
%endif %endif
%endif %endif
%else %else
%if %{fedora} >= 22 %if %{fedora} >= 22
%service lvmlockd 1 %service lvmlockd 1
%global enable_lockd_dlm 1 %global enable_lvmlockd_dlm 1
%endif %endif
%endif %endif
@ -192,8 +192,8 @@ BuildRequires: pkgconfig
%maybe BuildRequires: %{?buildreq_udev} %maybe BuildRequires: %{?buildreq_udev}
%maybe BuildRequires: %{?buildreq_cluster} %maybe BuildRequires: %{?buildreq_cluster}
%maybe BuildRequires: %{?buildreq_lockd_dlm} %maybe BuildRequires: %{?buildreq_lvmlockd_dlm}
%maybe BuildRequires: %{?buildreq_lockd_sanlock} %maybe BuildRequires: %{?buildreq_lvmlockd_sanlock}
%maybe BuildRequires: %{?buildreq_python2_devel} %maybe BuildRequires: %{?buildreq_python2_devel}
%maybe BuildRequires: %{?buildreq_python3_devel} %maybe BuildRequires: %{?buildreq_python3_devel}
%maybe BuildRequires: %{?buildreq_python_setuptools} %maybe BuildRequires: %{?buildreq_python_setuptools}