From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 24 Nov 2017 05:58:40 +0000 (+0100)
Subject: build/ops: rpm: reconstruct SUSE bconds
X-Git-Tag: wip-pdonnell-testing-20180317.202121~492^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dd08d17fdf87404553b4cdbf0ed603ed2d9d1595;p=ceph-ci.git

build/ops: rpm: reconstruct SUSE bconds

Disable java build completely. Enable lttng build on SLES only, and only for
certain architectures.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index bbc873eb70f..a2d2c31675c 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -15,12 +15,6 @@
 # Please submit bugfixes or comments via http://tracker.ceph.com/
 #
 %bcond_without ocf
-%bcond_without cephfs_java
-%if 0%{?suse_version}
-%bcond_with ceph_test_package
-%else
-%bcond_without ceph_test_package
-%endif
 %bcond_with make_check
 %ifarch s390 s390x
 %bcond_with tcmalloc
@@ -30,15 +24,24 @@
 %bcond_with lowmem_builder
 %if 0%{?fedora} || 0%{?rhel}
 %bcond_without selinux
+%bcond_without ceph_test_package
+%bcond_without cephfs_java
+%bcond_with lowmem_builder
+%bcond_without lttng
 %endif
 %if 0%{?suse_version}
 %bcond_with selinux
-%endif
-
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%if ! 0%{?is_opensuse}
+%bcond_with ceph_test_package
+%bcond_with cephfs_java
+%bcond_without lowmem_builder
+%if 0%{?is_opensuse}
 %bcond_without lttng
+%else
+%ifarch x86_64 aarch64
+%bcond_without lttng
+%else
+%bcond_with lttng
+%endif
 %endif
 %endif