From 088fbff7df5f77168d3e06a1430d3628bd982d7b Mon Sep 17 00:00:00 2001 From: Ricardo Dias Date: Thu, 29 Nov 2018 11:47:34 +0000 Subject: [PATCH] spec: fix cython package version to less than 0.29 Cython version 0.29 removed the support for python subinterpreters, which completely breaks ceph-mgr funcionality. See cython repo commit: https://github.com/cython/cython/commit/7e27c7cd51a2f048cd6d3c246740cd977f8d2e50 Fixes: http://tracker.ceph.com/issues/37472 Signed-off-by: Ricardo Dias --- ceph.spec.in | 8 ++++---- debian/control | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 200dfa34b640..c4ad3496c65c 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -230,7 +230,7 @@ BuildRequires: lsb-release BuildRequires: openldap2-devel BuildRequires: cunit-devel BuildRequires: python%{_python_buildid}-base -BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-Cython < 0.29 BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel @@ -248,7 +248,7 @@ BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core -BuildRequires: Cython +BuildRequires: Cython < 0.29 BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -257,11 +257,11 @@ BuildRequires: lz4-devel >= 1.7 %if 0%{?rhel} BuildRequires: python34-devel BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: python34-Cython < 0.29 %else BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython < 0.29 %endif # distro-conditional make check dependencies %if 0%{with make_check} diff --git a/debian/control b/debian/control index 677c8f907ee7..570fe0a1413d 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: bc, cmake (>= 3.5), cpio, cryptsetup-bin | cryptsetup, - cython, - cython3, + cython (< 0.29), + cython3 (< 0.29), debhelper (>= 9), default-jdk, dh-exec, -- 2.47.3