From 0b79741a770acb5cee6de2dd88022cd2c5d15ef5 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 15 Jan 2019 15:34:42 +0100 Subject: [PATCH] rpm: make Python build deps somewhat less confusing Signed-off-by: Nathan Cutler --- ceph.spec.in | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index ff9ac7de03c..f423901d811 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -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} -- 2.39.5