From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 12 Jun 2015 15:50:58 +0000 (+0200)
Subject: rpm: add missing Java conditionals
X-Git-Tag: v0.94.4~64^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6417e8eff942dbbf6cd231ffb73136b7bdcd837f;p=ceph.git

rpm: add missing Java conditionals

http://tracker.ceph.com/issues/11991 Fixes: #11991

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 04e91bbd929801de7f1d6a05086d47a781c2e361)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index cd885413ffb..59b63017db5 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -394,7 +394,9 @@ Requires:	librados2-devel = %{epoch}:%{version}-%{release}
 Requires:	libradosstriper1-devel = %{epoch}:%{version}-%{release}
 Requires:	librbd1-devel = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1-devel = %{epoch}:%{version}-%{release}
+%if 0%{with cephfs_java}
 Requires:	libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
+%endif
 Provides:	ceph-devel
 %description devel-compat
 This is a compatibility package to accommodate ceph-devel split into
@@ -431,10 +433,12 @@ python-cephfs instead.
 %endif
 
 %build
+%if 0%{with cephfs_java}
 # Find jni.h
 for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
     [ -d $i ] && java_inc="$java_inc -I$i"
 done
+%endif
 
 ./autogen.sh
 MY_CONF_OPT=""