]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rpm: always use 3 as the default python3_{pkgversion,version}
authorKefu Chai <kchai@redhat.com>
Tue, 9 Apr 2019 15:15:16 +0000 (23:15 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 10 Apr 2019 09:57:08 +0000 (17:57 +0800)
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)

ceph.spec.in

index 197e232ffbd9189f192d0596bb859ef8851cd617..d5d554fbbb66e54c8f96a5202ffe93d3fc634aba 100644 (file)
 
 %{!?_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}}