From: Kefu Chai <kchai@redhat.com>
Date: Tue, 24 Dec 2019 05:17:55 +0000 (+0800)
Subject: ceph.spec.in: re-enable "make check" deps for el8
X-Git-Tag: v14.2.10~2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68f396e16eb579cf04a4e129ef179354686bf74d;p=ceph.git

ceph.spec.in: re-enable "make check" deps for el8

this change partially reverts e92cb7a0. as these packages are now
available in AppStream, BaseOS or PowerTools in el8, in this change,
they are re-enabled.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 2a27084e1d77919571e338c4634576e4b36dbd02)

Conflicts:
	ceph.spec.in: trivial resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index b151d85942ba..c2cd5ba8cfeb 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -279,20 +279,20 @@ BuildRequires:	lz4-devel >= 1.7
 # distro-conditional make check dependencies
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
-%if 0%{?fedora} || 0%{?rhel} == 7
-BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-coverage
-BuildRequires:	python%{_python_buildid}-jwt
-BuildRequires:	python%{_python_buildid}-routes
 BuildRequires:	python%{_python_buildid}-pecan
 BuildRequires:	python%{_python_buildid}-tox
-BuildRequires:	python%{_python_buildid}-werkzeug
 BuildRequires:  xmlsec1
 %if 0%{?rhel} == 7
 BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
 BuildRequires:  python%{_python_buildid}-pyOpenSSL
 %endif
+BuildRequires:	python%{_python_buildid}-jwt
+BuildRequires:	python%{_python_buildid}-werkzeug
+%if 0%{?fedora} || 0%{?rhel} == 7
+BuildRequires:	python%{_python_buildid}-cherrypy
+BuildRequires:	python%{_python_buildid}-routes
 %endif
 %endif
 %if 0%{?suse_version}