From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 15 Jan 2019 14:34:42 +0000 (+0100)
Subject: rpm: make Python build deps somewhat less confusing
X-Git-Tag: v13.2.7~139^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0dc8188668c85c43a87f02a5c3a4c06db8f8e035;p=ceph.git

rpm: make Python build deps somewhat less confusing

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

Conflicts:
	ceph.spec.in
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 58d3fbe7731..923e9e45302 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -204,7 +204,7 @@ BuildRequires:  libopenssl-devel
 BuildRequires:  lsb-release
 BuildRequires:  openldap2-devel
 BuildRequires:  cunit-devel
-BuildRequires:	python%{_python_buildid}-base
+BuildRequires:	python%{_python_buildid}-setuptools
 BuildRequires:	python%{_python_buildid}-Cython
 BuildRequires:	python%{_python_buildid}-PrettyTable
 BuildRequires:	python%{_python_buildid}-Sphinx
@@ -225,13 +225,13 @@ BuildRequires:  redhat-lsb-core
 %if 0%{with python2}
 BuildRequires:	python2-Cython
 %endif
+BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-setuptools
+BuildRequires:	python%{python3_pkgversion}-Cython
 BuildRequires:	python%{_python_buildid}-prettytable
 BuildRequires:	python%{_python_buildid}-sphinx
 BuildRequires:	lz4-devel >= 1.7
 %endif
-BuildRequires:	python%{python3_pkgversion}-devel
-BuildRequires:	python%{python3_pkgversion}-setuptools
-BuildRequires:	python%{python3_pkgversion}-Cython
 # distro-conditional make check dependencies
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}