From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 3 Apr 2022 11:00:49 +0000 (+0200)
Subject: - correct pmdk dep and actually use that dep
X-Git-Tag: auto/th/ceph-16.2.7-4~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fceph.git;a=commitdiff_plain;h=720615cf4991b98bb07772b78f32676916cccc0f

- correct pmdk dep and actually use that dep
---

diff --git a/ceph.spec b/ceph.spec
index f438240..6bd439a 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -112,7 +112,7 @@ BuildRequires:	openldap-devel
 BuildRequires:	openssl-devel >= 1.1
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
-%{?with_pmem:BuildRequires:	pmdk-devel >= 1.10}
+%{?with_pmem:BuildRequires:	pmdk-devel >= 1.6.1}
 BuildRequires:	python3 >= 1:3.2
 BuildRequires:	python3-devel >= 1:3.2
 %{?with_tests:BuildRequires:	python3-tox >= 2.9.1}
@@ -327,7 +327,10 @@ cd build
 	-DPYTHON=%{__python3} \
 	-DSPHINX_BUILD=/usr/bin/sphinx-build \
 	%{!?with_babeltrace:-DWITH_BABELTRACE=OFF} \
-	%{?with_pmem:-DWITH_BLUESTORE_PMEM=ON} \
+%if %{with pmem}
+	-DWITH_BLUESTORE_PMEM=ON \
+	-DWITH_SYSTEM_PMDK:BOOL=ON \
+%endif
 	%{?with_java:-DWITH_CEPHFS_JAVA=ON} \
 	%{?with_java:-DJAVA_HOME:PATH=%{java_home}} \
 	%{?with_dpdk:-DWITH_DPDK=ON} \