From 0e5c37050051948d3832831fdcb52c0af5894bfa Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 30 Aug 2019 19:49:28 +0800 Subject: [PATCH] ceph.spec.in: s/pkgversion/version_nodots/ `python3_pkgversion` is now defined as 3, while we don't have packages like python3-Cython yet in EPEL7. but we do have `python36-Cython`. so let's use `python3_version_nodots` instead. Signed-off-by: Kefu Chai Conflicts: ceph.spec.in --- ceph.spec.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index dd5a20e706898..d2751296057bb 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -47,6 +47,7 @@ %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} +%{!?python3_version_nodots: %global python3_version_nodots 3} %{!?python3_version: %global python3_version 3} # unify libexec for all targets %global _libexecdir %{_exec_prefix}/lib @@ -193,9 +194,9 @@ BuildRequires: python-sphinx %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} -BuildRequires: python34-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_version_nodots}-Cython %else BuildRequires: python3-devel BuildRequires: python3-setuptools -- 2.39.5