diff options
author | David Teigland <teigland@redhat.com> | 2017-04-18 11:22:07 -0500 |
---|---|---|
committer | David Teigland <teigland@redhat.com> | 2017-04-18 11:22:07 -0500 |
commit | a5256d1353ef60a3f29a7af1a9d1389bc7d64104 (patch) | |
tree | ce2328f0f5ad1d7297b6964237cee6b5c3757f86 /spec | |
parent | a41a8430d6101af83160109f50df052aecc3818b (diff) | |
download | lvm2-a5256d1353ef60a3f29a7af1a9d1389bc7d64104.tar.gz |
spec: rename lockd to lvmlockd
Diffstat (limited to 'spec')
-rw-r--r-- | spec/build.inc | 4 | ||||
-rw-r--r-- | spec/packages.inc | 4 | ||||
-rw-r--r-- | spec/source.inc | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/spec/build.inc b/spec/build.inc index 88846c627..5321a7084 100644 --- a/spec/build.inc +++ b/spec/build.inc @@ -27,8 +27,8 @@ %enableif %{enable_lvmpolld} lvmpolld %global enable_lvmlockd %(if echo %{services} | grep -q lvmlockd; then echo 1; else echo 0; fi) %if %{enable_lvmlockd} -%enableif %{enable_lockd_dlm} lockd-dlm -%enableif %{enable_lockd_sanlock} lockd-sanlock +%enableif %{enable_lvmlockd_dlm} lvmlockd-dlm +%enableif %{enable_lvmlockd_sanlock} lvmlockd-sanlock %endif %enableif %{enable_python} python2-bindings %enableif %{enable_python3} python3-bindings diff --git a/spec/packages.inc b/spec/packages.inc index 74c4270c4..cdcc197d0 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -275,10 +275,10 @@ This package contains shared lvm2 libraries for applications. Summary: LVM locking daemon Group: System Environment/Base Requires: lvm2 = %{version}-%{release} -%if %{enable_lockd_dlm} +%if %{enable_lvmlockd_dlm} Requires: dlm-lib >= %{dlm_version} %endif -%if %{enable_lockd_sanlock} +%if %{enable_lvmlockd_sanlock} Requires: sanlock-lib >= %{sanlock_version} %endif Requires(post): systemd-units diff --git a/spec/source.inc b/spec/source.inc index a49b45468..fb7ccf5dc 100644 --- a/spec/source.inc +++ b/spec/source.inc @@ -16,8 +16,8 @@ %global enable_lvmetad 1 %global enable_lvmpolld 1 %global enable_dmfilemapd 0 -#%global enable_lockd_dlm 0 -#%global enable_lockd_sanlock 0 +#%global enable_lvmlockd_dlm 0 +#%global enable_lvmlockd_sanlock 0 %if %{enable_udev} %service lvmetad 1 @@ -52,24 +52,24 @@ %if %{fedora} >= 24 || %{rhel} >= 7 %service lvmlockd 1 %global sanlock_version 3.3.0-1 - %global enable_lockd_dlm 1 - %global enable_lockd_sanlock 1 + %global enable_lvmlockd_dlm 1 + %global enable_lvmlockd_sanlock 1 %if %{rhel} %ifarch i686 x86_64 s390x - %global buildreq_lockd_dlm dlm-devel >= %{dlm_version} + %global buildreq_lvmlockd_dlm dlm-devel >= %{dlm_version} %else - %global enable_lockd_dlm 0 + %global enable_lvmlockd_dlm 0 %endif %ifarch x86_64 ppc64le ppc64 aarch64 - %global buildreq_lockd_sanlock sanlock-devel >= %{sanlock_version} + %global buildreq_lvmlockd_sanlock sanlock-devel >= %{sanlock_version} %else - %global enable_lockd_sanlock 0 + %global enable_lvmlockd_sanlock 0 %endif %endif %else %if %{fedora} >= 22 %service lvmlockd 1 - %global enable_lockd_dlm 1 + %global enable_lvmlockd_dlm 1 %endif %endif @@ -192,8 +192,8 @@ BuildRequires: pkgconfig %maybe BuildRequires: %{?buildreq_udev} %maybe BuildRequires: %{?buildreq_cluster} -%maybe BuildRequires: %{?buildreq_lockd_dlm} -%maybe BuildRequires: %{?buildreq_lockd_sanlock} +%maybe BuildRequires: %{?buildreq_lvmlockd_dlm} +%maybe BuildRequires: %{?buildreq_lvmlockd_sanlock} %maybe BuildRequires: %{?buildreq_python2_devel} %maybe BuildRequires: %{?buildreq_python3_devel} %maybe BuildRequires: %{?buildreq_python_setuptools} |