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

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

ceph.spec.in

index cd885413ffbb15afddea769c84185dc9ec418c33..59b63017db55b113d38728819a92f0897f56fba1 100644 (file)
@@ -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=""