]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: add missing Java conditionals 4942/head
authorNathan Cutler <ncutler@suse.com>
Fri, 12 Jun 2015 15:50:58 +0000 (17:50 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 12 Jun 2015 15:50:58 +0000 (17:50 +0200)
http://tracker.ceph.com/issues/11991 Fixes: #11991

Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index 312cf97bd47ddc0d1b43b2152af6c192675ca39e..9cacc8c8dd5c66f25cfeb90365b61d66096e193a 100644 (file)
@@ -433,7 +433,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
@@ -470,10 +472,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=""