From: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Date: Mon, 15 Mar 2021 21:08:27 +0000 (+0100)
Subject: ceph.spec.in: use ninja instead of ninja-build for openSUSE
X-Git-Tag: v17.1.0~2587^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40136%2Fhead;p=ceph.git

ceph.spec.in: use ninja instead of ninja-build for openSUSE

And since the dependency is now distro-conditional, moving it down
to the 'distro-conditional make check dependencies' section.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index b26bda86cab6..18d86dbb5fa4 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -252,7 +252,6 @@ BuildRequires:  %{luarocks_package_name}
 %if 0%{with make_check}
 BuildRequires:  jq
 BuildRequires:	libuuid-devel
-BuildRequires:	ninja-build
 BuildRequires:	python%{python3_pkgversion}-bcrypt
 BuildRequires:	python%{python3_pkgversion}-nose
 BuildRequires:	python%{python3_pkgversion}-pecan
@@ -356,6 +355,7 @@ BuildRequires:	lz4-devel >= 1.7
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	libtool-ltdl-devel
+BuildRequires:	ninja-build
 BuildRequires:	xmlsec1
 BuildRequires:	xmlsec1-devel
 %ifarch x86_64
@@ -374,6 +374,7 @@ BuildRequires:	python%{python3_pkgversion}-pyOpenSSL
 BuildRequires:	libxmlsec1-1
 BuildRequires:	libxmlsec1-nss1
 BuildRequires:	libxmlsec1-openssl1
+BuildRequires:	ninja
 BuildRequires:	python%{python3_pkgversion}-CherryPy
 BuildRequires:	python%{python3_pkgversion}-PyJWT
 BuildRequires:	python%{python3_pkgversion}-Routes