From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 7 Apr 2017 04:48:51 +0000 (+0200)
Subject: build/ops: rpm: explicitly provide --with-ocf to configure
X-Git-Tag: v10.2.8~84^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb3eb4284fe74cbf78e4a406c7b5f67a8e3c84b3;p=ceph.git

build/ops: rpm: explicitly provide --with-ocf to configure

Fixes: http://tracker.ceph.com/issues/19546
Signed-off-by: Nathan Cutler <ncutler@suse.com>

(Note: This cannot be cherry-picked because master uses cmake, but
the fix does bring the jewel spec file into better alignment its master
counterpart, at least as far as this one little bit is concerned.)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 38d7e9ccf08..82b20515dbf 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -668,7 +668,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--without-babeltrace \
 %endif
 		$CEPH_EXTRA_CONFIGURE_ARGS \
-		%{?_with_ocf} \
+%if 0%{with ocf}
+		--with-ocf \
+%endif
 %if %{without tcmalloc}
 		--without-tcmalloc \
 %endif