diff --git a/openEuler-update-the-definition-of-python3_version.patch b/Fix-python3_version-macros-for-Python-3.10.patch similarity index 53% rename from openEuler-update-the-definition-of-python3_version.patch rename to Fix-python3_version-macros-for-Python-3.10.patch index 72f9491936026e8fd2662b9aa2bdf3fc8578c471..fc76959ba7f2ff33af3afb3319f8acfaed9f92e9 100644 --- a/openEuler-update-the-definition-of-python3_version.patch +++ b/Fix-python3_version-macros-for-Python-3.10.patch @@ -1,26 +1,30 @@ -From cec0cb9fbd58016b29a24bbfd365d5ddf7cd614c Mon Sep 17 00:00:00 2001 -From: shixuantong -Date: Fri, 26 Nov 2021 13:51:27 +0800 -Subject: [PATCH] update the definition of python3_version, the original - definition does not recognize python3-3.10 +From 84ed1ab69d4b1e0aea452350d9f2865e8f7c28e7 Mon Sep 17 00:00:00 2001 +From: Miro HronĨok +Date: Aug 26 2019 13:24:23 +0000 +Subject: Fix %python3_version macros for Python 3.10 + + +No need to bump the release, 3.10 is far from now. + +Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1745601 --- - macros.python | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.python b/macros.python -index 34795b5..714cb05 100644 +index 1952aed..a170c4b 100644 --- a/macros.python +++ b/macros.python -@@ -139,7 +139,7 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth +@@ -139,8 +139,8 @@ find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $pyth %__python3 /usr/bin/python3 %python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python3_sitearch %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") -%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3])") -+%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write(str(sys.version_info[0]) + '.' + str(sys.version_info[1]))") - %python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") +-%python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") ++%python3_version %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") ++%python3_version_nodots %(%{__python3} -Ic "import sys; sys.stdout.write('{0.major}{0.minor}'.format(sys.version_info))") %python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())") %py3dir %{_builddir}/python3-%{name}-%{version}-%{release} + -- -1.8.3.1 +2.27.0 diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 371756abc2192f61437ec73f89a76de65bbacaf2..212f6104a753c8472b2ea1d3adca585106f2b8ae 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 24 +Release: 25 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -18,7 +18,7 @@ Patch4: openEuler-remove-fexceptions.patch Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: add-common-script.patch -Patch8: openEuler-update-the-definition-of-python3_version.patch +Patch8: Fix-python3_version-macros-for-Python-3.10.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -119,6 +119,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/%{_vendor} common.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Mon Dec 13 2021 Liu Zixian - 30-25 +- fix python macros + * Fri Nov 26 2021 shixuantong - 30-24 - update the definition of python3_version