From: Kefu Chai <kchai@redhat.com>
Date: Fri, 30 Aug 2019 11:49:28 +0000 (+0800)
Subject: ceph.spec.in: s/pkgversion/version_nodots/
X-Git-Tag: v12.2.13~109^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30722%2Fhead;p=ceph.git

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 <kchai@redhat.com>

Conflicts:
	ceph.spec.in
---

diff --git a/ceph.spec.in b/ceph.spec.in
index dd5a20e7068..d2751296057 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