From: Alfonso Martínez <almartin@redhat.com>
Date: Thu, 23 Jan 2020 10:16:27 +0000 (+0100)
Subject: ceph.spec.in: fix 'make check' deps for centos8
X-Git-Tag: v15.1.0~71^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32798%2Fhead;p=ceph.git

ceph.spec.in: fix 'make check' deps for centos8

When running 'FOR_MAKE_CHECK=1 ./install-deps.sh' in CentOS 8
these dependencies were not being installed.
Missing dependencies are provided by
https://copr.fedorainfracloud.org/coprs/ktdreyer/ceph-el8/

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5a24223f179a..625a17fe8aa1 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -203,12 +203,12 @@ BuildRequires:  jq
 BuildRequires:	libuuid-devel
 BuildRequires:	python%{python3_pkgversion}-bcrypt
 BuildRequires:	python%{python3_pkgversion}-nose
+BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-requests
 BuildRequires:	python%{python3_pkgversion}-six
 BuildRequires:	python%{python3_pkgversion}-virtualenv
 %if 0%{?rhel} < 8
 BuildRequires:	python%{python3_pkgversion}-coverage
-BuildRequires:	python%{python3_pkgversion}-pecan
 BuildRequires:	python%{python3_pkgversion}-tox
 %endif
 %if 0%{?rhel} == 7
@@ -291,13 +291,12 @@ BuildRequires:	xmlsec1-nss
 %endif
 BuildRequires:	xmlsec1-openssl
 BuildRequires:	xmlsec1-openssl-devel
+BuildRequires:	python%{python3_pkgversion}-cherrypy
 BuildRequires:	python%{python3_pkgversion}-jwt
+BuildRequires:	python%{python3_pkgversion}-routes
+BuildRequires:	python%{python3_pkgversion}-scipy
 BuildRequires:	python%{python3_pkgversion}-werkzeug
 BuildRequires:  python%{python3_pkgversion}-pyOpenSSL
-%if 0%{?fedora} || 0%{?rhel} == 7
-BuildRequires:	python%{python3_pkgversion}-cherrypy
-BuildRequires:	python%{python3_pkgversion}-routes
-%endif
 %endif
 %if 0%{?suse_version}
 BuildRequires:	libxmlsec1-1