From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 22 May 2017 12:52:26 +0000 (+0200)
Subject: build/ops: rpm: move RDMA build dependency to distro-conditional section
X-Git-Tag: v12.1.0~57^2~54^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba641b5160e3863e342b379c46eb0a0827b6c628;p=ceph.git

build/ops: rpm: move RDMA build dependency to distro-conditional section

SUSE ships this package under the name "rdma-core-devel". See
https://build.opensuse.org/package/view_file/openSUSE:Factory/rdma-core/rdma-core.spec?expand=1

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 30831c11c30f..569771103fad 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -133,7 +133,6 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
-BuildRequires:	libibverbs-devel
 
 #################################################################################
 # distro-conditional dependencies
@@ -155,6 +154,7 @@ BuildRequires:  openldap2-devel
 BuildRequires:	python-CherryPy
 BuildRequires:	python-Cython
 BuildRequires:	python-Sphinx
+BuildRequires:  rdma-core-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} 
 Requires:	systemd
@@ -162,6 +162,7 @@ BuildRequires:  boost-random
 BuildRequires:	btrfs-progs
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
+BuildRequires:	libibverbs-devel
 BuildRequires:  openldap-devel
 BuildRequires:  openssl-devel
 BuildRequires:  redhat-lsb-core