From 99f8b82d04ce08c351bdde3a758de46e9f18a86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 4 Feb 2019 15:05:57 +0100 Subject: [PATCH] Switch 3.4 and 3.6 --- macros.python-srpm | 6 +++--- macros.python3 | 2 +- macros.python3_other | 2 +- python-rpm-macros.spec | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/macros.python-srpm b/macros.python-srpm index 14774b9..92193f8 100644 --- a/macros.python-srpm +++ b/macros.python-srpm @@ -1,7 +1,7 @@ # python3_pkgversion specifies the version of Python 3 in the distro. It can be -# a specific version (e.g. 34 in Fedora EPEL7) -%python3_pkgversion 34 -%python3_other_pkgversion 36 +# a specific version (e.g. 36 in Fedora EPEL7) +%python3_pkgversion 36 +%python3_other_pkgversion 34 # Set to /bin/true when not active to avoid %ifdefs and %{? in specfiles %__python3_other /bin/true diff --git a/macros.python3 b/macros.python3 index a188a7f..242e72a 100644 --- a/macros.python3 +++ b/macros.python3 @@ -1,4 +1,4 @@ -%__python3 /usr/bin/python3.4 +%__python3 /usr/bin/python3.6 %python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") diff --git a/macros.python3_other b/macros.python3_other index 320b151..1ce91ec 100644 --- a/macros.python3_other +++ b/macros.python3_other @@ -1,4 +1,4 @@ -%__python3_other /usr/bin/python3.6 +%__python3_other /usr/bin/python3.4 %python3_other_sitelib %(%{__python3_other} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python3_other_sitearch %(%{__python3_other} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 36b5a6a..fc73d05 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 22%{?dist} +Release: 23%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -67,6 +67,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %changelog +* Thu Jan 31 2019 Miro Hrončok - 3-23 +- Make Python 3.6 the main Python 3 version +- Make Python 3.4 the other Python 3 version + * Sat Jul 14 2018 Tomas Orsava - 3-22 - Move macros.pybytecompile in here from python3X-devel - macros.pybytecompile: Detect Python version through sys.version_info instead