From: Michel Normand <normand@linux.vnet.ibm.com>
Date: Fri, 5 Aug 2016 13:19:50 +0000 (+0200)
Subject: LTTng-UST disabled for openSUSE
X-Git-Tag: v11.0.1~428^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7da19b6db7eaefb5fe159375cc5a465a722d3897;p=ceph.git

LTTng-UST disabled for openSUSE

LTTng-UST not yet supported in openSUSE so do not enable lltng for it.
The (1) is where is defined "is_opensuse"

Remove value for test of suse_version in spec file
and change related comment from SLES12 to SLE
as per comment in https://github.com/ceph/ceph/pull/10592

(1) https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code

Fixes: http://tracker.ceph.com/issues/16937
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5857a1562c3d..cd8f8e51727b 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -33,10 +33,12 @@
 %bcond_with selinux
 %endif
 
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLES 12
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} == 1315
+# 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_without lttng
 %endif
+%endif
 
 %if %{with selinux}
 # get selinux policy version