From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 15 Feb 2019 17:06:39 +0000 (+0100)
Subject: rpm: no lttng build on openSUSE s390x
X-Git-Tag: v12.2.13~168^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=224c7ee466e9c2e03a9d33dc75f1ef50fb0347ab;p=ceph.git

rpm: no lttng build on openSUSE s390x

Since the lttng-ust-devel and babeltrace-devel RPMs are not maintained for s390x
in openSUSE, we have to exclude the lttng build on this architecture.

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

Conflicts:
	ceph.spec.in
---

diff --git a/ceph.spec.in b/ceph.spec.in
index ecb1bc23bf2..204791f9950 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -34,16 +34,12 @@
 %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
 
 %if %{with selinux}
 # get selinux policy version