From: Kefu Chai <kchai@redhat.com>
Date: Tue, 9 Apr 2019 15:15:16 +0000 (+0800)
Subject: rpm: always use 3 as the default python3_{pkgversion,version}
X-Git-Tag: v13.2.6~84^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1ebc4114364d52b0f956711a9ef38371a0f88e60;p=ceph.git

rpm: always use 3 as the default python3_{pkgversion,version}

as we have the rpm macros installed in
https://github.com/ceph/ceph-build/pull/1283 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 11f0b8d5a8951cb50437f5e87055f3b9405f4556)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 197e232ffbd91..d5d554fbbb66e 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -67,13 +67,8 @@
 
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
-%if 0%{?rhel} == 7
-%{!?python3_pkgversion: %global python3_pkgversion 36}
-%{!?python3_version: %global python3_version 3.6}
-%else
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 %{!?python3_version: %global python3_version 3}
-%endif
 # define _python_buildid macro which will expand to the empty string when
 # building with python2
 %global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}