From: Kefu Chai <kchai@redhat.com>
Date: Sat, 28 Sep 2019 13:57:29 +0000 (+0800)
Subject: ceph.spec.in: disable cephfs_java and amqp_endpoint if RHEL8
X-Git-Tag: v14.2.10~2^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b751d468a448c8b92ddec0bbb7db8efd9a5e905b;p=ceph.git

ceph.spec.in: disable cephfs_java and amqp_endpoint if RHEL8

RHEL/CentOS 8 does not offer junit and sharutils yet, so disable
cephfs_java on rhel8 at this moment.

RHEL/CentOS 8 does not offer librabbitmq-devel yet, so disable
amqp_endpoint on rhel8 at this moment.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit dd133840b9d35ca7d8b1788836f6076b06c33087)

Conflicts:
	ceph.spec.in: trivial resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index dc115090f1a7..9b705099fe06 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -30,11 +30,16 @@
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
+%if 0%{?rhel} >= 8
+%bcond_with cephfs_java
+%bcond_with amqp_endpoint
+%else
 %bcond_without cephfs_java
+%bcond_without amqp_endpoint
+%endif
 %bcond_without lttng
 %bcond_without libradosstriper
 %bcond_without ocf
-%bcond_without amqp_endpoint
 %bcond_without kafka_endpoint
 %global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif