From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 19 Mar 2019 11:22:32 +0000 (+0100)
Subject: rpm: refrain from building ceph-resource-agents on SLE
X-Git-Tag: v15.0.0~166^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27046%2Fhead;p=ceph.git

rpm: refrain from building ceph-resource-agents on SLE

Fixes: https://tracker.ceph.com/issues/38812
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5844a5af3c5d..8e1b5b94c047 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -21,7 +21,6 @@
 # please read http://rpm.org/user_doc/conditional_builds.html for explanation of
 # bcond syntax!
 #################################################################################
-%bcond_without ocf
 %bcond_with make_check
 %ifarch s390 s390x
 %bcond_with tcmalloc
@@ -34,6 +33,7 @@
 %bcond_without cephfs_java
 %bcond_without lttng
 %bcond_without libradosstriper
+%bcond_without ocf
 %bcond_without amqp_endpoint
 %global _remote_tarball_prefix https://download.ceph.com/tarballs/
 %endif
@@ -48,8 +48,10 @@
 %endif
 %if 0%{?is_opensuse}
 %bcond_without libradosstriper
+%bcond_without ocf
 %else
 %bcond_with libradosstriper
+%bcond_with ocf
 %endif
 %ifarch x86_64 aarch64 ppc64le
 %bcond_without lttng