From: Kefu Chai Date: Mon, 19 Apr 2021 07:49:37 +0000 (+0800) Subject: Merge pull request #40749 from tchaikov/wip-python3-spec X-Git-Tag: v17.1.0~2216 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f057ea202f0035b02a4d4f298d065f5663c8efb5;p=ceph.git Merge pull request #40749 from tchaikov/wip-python3-spec ceph.spec: consolidate python3-{setuptools,Cython} builds deps Reviewed-by: Josh Durgin Reviewed-by: Brad Hubbard --- f057ea202f0035b02a4d4f298d065f5663c8efb5 diff --cc ceph.spec.in index 66e069e5bcda,86e1fa2acef5..ff020cd3e0d0 --- a/ceph.spec.in +++ b/ceph.spec.in @@@ -324,10 -326,7 +326,8 @@@ BuildRequires: openldap2-deve #BuildRequires: krb5 #BuildRequires: krb5-devel BuildRequires: cunit-devel - BuildRequires: python%{python3_pkgversion}-setuptools - BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{python3_pkgversion}-PrettyTable +BuildRequires: python%{python3_pkgversion}-PyYAML BuildRequires: python%{python3_pkgversion}-Sphinx BuildRequires: rdma-core-devel BuildRequires: liblz4-devel >= 1.7 @@@ -347,10 -346,7 +347,8 @@@ BuildRequires: openssl-deve BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core BuildRequires: python%{python3_pkgversion}-devel - BuildRequires: python%{python3_pkgversion}-setuptools - BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{python3_pkgversion}-prettytable +BuildRequires: python%{python3_pkgversion}-pyyaml BuildRequires: python%{python3_pkgversion}-sphinx BuildRequires: lz4-devel >= 1.7 %endif