]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: make Python build deps somewhat less confusing
authorNathan Cutler <ncutler@suse.com>
Tue, 15 Jan 2019 14:34:42 +0000 (15:34 +0100)
committerNathan Cutler <ncutler@suse.com>
Fri, 4 Oct 2019 10:04:27 +0000 (12:04 +0200)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0b79741a770acb5cee6de2dd88022cd2c5d15ef5)

Conflicts:
ceph.spec.in

ceph.spec.in

index 58d3fbe77316ed8e1fe4e02eabfe11f8d102f742..923e9e45302c05b6ee8236fe3fd2cdbbea932bed 100644 (file)
@@ -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}