From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 25 Feb 2021 18:01:18 +0000 (+0100)
Subject: rpm: re-disable SUSE lttng build on z390x
X-Git-Tag: v14.2.22~27^2~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd060f20edf209f4084e50363ec594c68e0147cb;p=ceph.git

rpm: re-disable SUSE lttng build on z390x

This partially reverts 2b1e646f7aade3135a98c505111ac7ebef5e93a6 which
mistakenly changed a line inside an "%if 0%{?suse_version}" conditional.

Fixes: 2b1e646f7aade3135a98c505111ac7ebef5e93a6
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit ffd202a08619fc535df593eb41c0769577a1586a)

Conflicts:
	ceph.spec.in
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 2709d6bd474..c944e0e07ae 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -58,7 +58,7 @@
 %bcond_with libradosstriper
 %bcond_with ocf
 %endif
-%ifarch x86_64 aarch64 ppc64le s390x
+%ifarch x86_64 aarch64 ppc64le
 %bcond_without lttng
 %else
 %bcond_with lttng