From bca6167d73e266438b54762ca6ea8dceb746ee9f Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 10 Jul 2015 10:12:22 +0200 Subject: [PATCH] ceph.spec.in: fix babeltrace handling on SUSE Since we BuildRequire: babeltrace-devel, autoconf will see that babeltrace is available during the build, and make will build/install the rbd-replay-prep utility. Signed-off-by: Nathan Cutler (cherry picked from commit 80f3c95b60f49f782c3d4c03974fadf66b6d03f5) --- ceph.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 6b57c26154a3f..bb39d934c80c4 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -370,10 +370,14 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: ceph-common Requires: xmlstarlet -%if (0%{?fedora} || 0%{?rhel} == 6) +%if 0%{?fedora} || 0%{?rhel} == 6 BuildRequires: lttng-ust-devel BuildRequires: libbabeltrace-devel %endif +%if 0%(?suse_version) +BuildRequires: lttng-ust-devel +BuildRequires: babeltrace-devel +%endif %description -n ceph-test This package contains Ceph benchmarks and test tools. @@ -1086,7 +1090,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_mandir}/man8/rbd-replay-prep.8* %{_bindir}/rbd-replay %{_bindir}/rbd-replay-many -%if (0%{?fedora} || 0%{?rhel} == 6) +%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} %{_bindir}/rbd-replay-prep %endif -- 2.39.5