From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 9 Jul 2018 11:18:11 +0000 (+0200)
Subject: rpm: remove universal requires from distro-specific conditional blocks
X-Git-Tag: v13.2.1~20^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40bdcaa5cbff67fe1127828fb279626a626a5a89;p=ceph.git

rpm: remove universal requires from distro-specific conditional blocks

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3a30dd13a362ffff6d02e5116c47b5f7ace078a3)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 99e858922695..1d2958e56b54 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -155,9 +155,6 @@ BuildRequires:	python%{_python_buildid}-nose
 BuildRequires:	python%{_python_buildid}-requests
 BuildRequires:	python%{_python_buildid}-virtualenv
 BuildRequires:	snappy-devel
-%if 0%{with make_check}
-BuildRequires:	socat
-%endif
 BuildRequires:	udev
 BuildRequires:	util-linux
 BuildRequires:	valgrind-devel
@@ -166,6 +163,13 @@ BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
 BuildRequires:	xmlstarlet
 BuildRequires:	yasm
+%if 0%{with make_check}
+BuildRequires:	python%{_python_buildid}-coverage
+BuildRequires:	python%{_python_buildid}-pecan
+BuildRequires:	python%{_python_buildid}-six
+BuildRequires:	python%{_python_buildid}-tox
+BuildRequires:	socat
+%endif
 
 #################################################################################
 # distro-conditional dependencies
@@ -223,11 +227,7 @@ BuildRequires:	python3-Cython
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-routes
-BuildRequires:	python%{_python_buildid}-pecan
 BuildRequires:	python%{_python_buildid}-werkzeug
-BuildRequires:	python%{_python_buildid}-tox
-BuildRequires:	python%{_python_buildid}-coverage
-BuildRequires:	python%{_python_buildid}-six
 %if 0%{?fedora}
 BuildRequires:	python%{_python_buildid}-bcrypt
 %endif
@@ -239,12 +239,8 @@ BuildRequires:	py-bcrypt
 BuildRequires:	python%{_python_buildid}-CherryPy
 BuildRequires:	python%{_python_buildid}-Routes
 BuildRequires:	python%{_python_buildid}-Werkzeug
-BuildRequires:	python%{_python_buildid}-pecan
 BuildRequires:	python%{_python_buildid}-numpy-devel
 BuildRequires:	python%{_python_buildid}-bcrypt
-BuildRequires:	python%{_python_buildid}-tox
-BuildRequires:	python%{_python_buildid}-coverage
-BuildRequires:	python%{_python_buildid}-six
 %endif
 %endif
 # lttng and babeltrace for rbd-replay-prep
@@ -369,12 +365,12 @@ Summary:        Ceph Manager Daemon
 Group:          System/Filesystems
 %endif
 Requires:       ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires:       python%{_python_buildid}-pecan
+Requires:       python%{_python_buildid}-six
 %if 0%{?fedora} || 0%{?rhel}
 Requires:       python%{_python_buildid}-cherrypy
 Requires:       python%{_python_buildid}-jinja2
-Requires:       python%{_python_buildid}-pecan
 Requires:       python%{_python_buildid}-routes
-Requires:       python%{_python_buildid}-six
 Requires:       python%{_python_buildid}-werkzeug
 Requires:       pyOpenSSL%{_python_buildid}
 %if 0%{?fedora}
@@ -389,9 +385,7 @@ Requires:       python%{_python_buildid}-CherryPy
 Requires:       python%{_python_buildid}-Routes
 Requires:       python%{_python_buildid}-Jinja2
 Requires:       python%{_python_buildid}-Werkzeug
-Requires:       python%{_python_buildid}-pecan
 Requires:       python%{_python_buildid}-pyOpenSSL
-Requires:       python%{_python_buildid}-six
 Requires:       python%{_python_buildid}-bcrypt
 Recommends:     python%{_python_buildid}-influxdb
 %endif