]> git.apps.os.sepia.ceph.com Git - ceph-ci.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>
Thu, 14 Feb 2019 09:30:55 +0000 (10:30 +0100)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
ceph.spec.in

index ff9ac7de03c6cbc143d71903e905b18dadc77df7..f423901d81104b62ea94b7b5c5728ae5ab1c37b4 100644 (file)
@@ -228,7 +228,7 @@ BuildRequires:  openldap2-devel
 #BuildRequires:  krb5
 #BuildRequires:  krb5-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
@@ -249,11 +249,6 @@ BuildRequires:  openssl-devel
 BuildRequires:  CUnit-devel
 BuildRequires:  redhat-lsb-core
 BuildRequires: Cython
-BuildRequires: python%{_python_buildid}-prettytable
-BuildRequires: python%{_python_buildid}-sphinx
-BuildRequires: lz4-devel >= 1.7
-%endif
-# python34-... for RHEL, python3-... for all other supported distros
 %if 0%{?rhel}
 BuildRequires: python34-devel
 BuildRequires: python34-setuptools
@@ -263,6 +258,10 @@ BuildRequires:     python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-Cython
 %endif
+BuildRequires: python%{_python_buildid}-prettytable
+BuildRequires: python%{_python_buildid}-sphinx
+BuildRequires: lz4-devel >= 1.7
+%endif
 # distro-conditional make check dependencies
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}