Merge pull request #35598 from tchaikov/wip-cephfs-java

rpm,install-dep.sh: build cephfs java binding

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

diff --cc ceph.spec.in
index f2bd82b3026d4af8b0f8202d176d652400070833,308cf40aa2545977050a7d93c40b7b4544878dfd..fb0aa99d95148edaa16299296d5755835749834e
--- 1/ceph.spec.in
--- 2/ceph.spec.in
+++ b/ceph.spec.in
@@@ -29,24 -29,9 +29,20 @@@
  %else
  %bcond_without tcmalloc
  %endif
 +%bcond_without rbd_ssd_cache
 +%ifarch x86_64
 +%bcond_without rbd_rwl_cache
 +%else
 +%bcond_with rbd_rwl_cache
 +%endif
  %if 0%{?fedora} || 0%{?rhel}
 +%if 0%{?rhel} < 9
 +%bcond_with system_pmdk
 +%else
 +%bcond_without system_pmdk
 +%endif
  %bcond_without selinux
- %if 0%{?rhel} >= 8
- %bcond_with cephfs_java
- %else
  %bcond_without cephfs_java
- %endif
  %bcond_without amqp_endpoint
  %bcond_without kafka_endpoint
  %bcond_without lttng

diff --cc install-deps.sh
index dcf988696352c9672f236f42667100866a67dca5,5345e73a20b20762f8d26f384e88de8a8b490496..41138d7cc17c5b0200e8170e1351df4d9893e653
--- 1/install-deps.sh
--- 2/install-deps.sh
+++ b/install-deps.sh
@@@ -428,10 -350,12 +428,12 @@@ EO
                    # before EPEL8 and PowerTools provide all dependencies, we use sepia for the dependencies
                      $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
                      $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
+                     $SUDO dnf -y module enable javapackages-tools
                  elif test $ID = rhel -a $MAJOR_VERSION = 8 ; then
 -                    $SUDO subscription-manager repos --enable "codeready-builder-for-rhel-8-${ARCH}-rpms"
 +                    $SUDO dnf config-manager --set-enabled "codeready-builder-for-rhel-8-${ARCH}-rpms"
                    $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
                    $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
+                   $SUDO dnf -y module enable javapackages-tools
                  fi
                  ;;
          esac