custom/rpm-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!67 fix python macros

Browse Source 
Merge pull request !67 from sdlzx/master
This commit is contained in:
openeuler-ci-bot 2022-01-12 03:57:55 +00:00 committed by Gitee
commit 83375e367a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openEuler-update-the-definition-of-python3_version.patch → Fix-python3_version-macros-for-Python-3.10.patch
View File

@ -1,26 +1,30 @@
From cec0cb9fbd58016b29a24bbfd365d5ddf7cd614c Mon Sep 17 00:00:00 2001 From 84ed1ab69d4b1e0aea452350d9f2865e8f7c28e7 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong@huawei.com> From: Miro Hrončok <miro@hroncok.cz>
Date: Fri, 26 Nov 2021 13:51:27 +0800 Date: Aug 26 2019 13:24:23 +0000
Subject: [PATCH] update the definition of python3_version, the original Subject: Fix %python3_version macros for Python 3.10
definition does not recognize python3-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 diff --git a/macros.python b/macros.python
index 34795b5..714cb05 100644 index 1952aed..a170c4b 100644
--- a/macros.python --- a/macros.python
+++ b/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 /usr/bin/python3
%python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %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_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(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())") %python3_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")
%py3dir %{_builddir}/python3-%{name}-%{version}-%{release} %py3dir %{_builddir}/python3-%{name}-%{version}-%{release}
--
1.8.3.1 --
2.27.0

7
openEuler-rpm-config.spec
View File

@ -3,7 +3,7 @@
Name: %{vendor}-rpm-config Name: %{vendor}-rpm-config
Version: 30 Version: 30
Release: 24 Release: 25
License: GPL+ License: GPL+
Summary: specific rpm configuration files Summary: specific rpm configuration files
URL: https://gitee.com/openeuler/openEuler-rpm-config 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 Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch
Patch6: add-brp-scripts-to-delete-rpath.patch Patch6: add-brp-scripts-to-delete-rpath.patch
Patch7: add-common-script.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: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: python2-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 %{_rpmconfigdir}/macros.d/macros.kmp
%changelog %changelog
* Mon Dec 13 2021 Liu Zixian <liuzixian4@huawei.com> - 30-25
- fix python macros
* Fri Nov 26 2021 shixuantong <shixuantong@huawei.com> - 30-24 * Fri Nov 26 2021 shixuantong <shixuantong@huawei.com> - 30-24
- update the definition of python3_version - update the definition of python3_version