update the definition of python3_version
This commit is contained in:
parent
e86c484559
commit
4480285039
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: %{vendor}-rpm-config
|
Name: %{vendor}-rpm-config
|
||||||
Version: 30
|
Version: 30
|
||||||
Release: 23
|
Release: 24
|
||||||
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,6 +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
|
||||||
|
|
||||||
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}
|
||||||
@ -118,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
|
||||||
|
* Fri Nov 26 2021 shixuantong <shixuantong@huawei.com> - 30-24
|
||||||
|
- update the definition of python3_version
|
||||||
|
|
||||||
* Wed Oct 13 2021 wangkerong <wangkerong@huawei.com> - 30-23
|
* Wed Oct 13 2021 wangkerong <wangkerong@huawei.com> - 30-23
|
||||||
- add common lua scripts resolve "%fontpkg" macro translation failure
|
- add common lua scripts resolve "%fontpkg" macro translation failure
|
||||||
|
|
||||||
|
|||||||
26
openEuler-update-the-definition-of-python3_version.patch
Normal file
26
openEuler-update-the-definition-of-python3_version.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
From cec0cb9fbd58016b29a24bbfd365d5ddf7cd614c Mon Sep 17 00:00:00 2001
|
||||||
|
From: shixuantong <shixuantong@huawei.com>
|
||||||
|
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
|
||||||
|
|
||||||
|
---
|
||||||
|
macros.python | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/macros.python b/macros.python
|
||||||
|
index 34795b5..714cb05 100644
|
||||||
|
--- a/macros.python
|
||||||
|
+++ b/macros.python
|
||||||
|
@@ -139,7 +139,7 @@ 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_platform %(%{__python3} -Ic "import sysconfig; print(sysconfig.get_platform())")
|
||||||
|
%py3dir %{_builddir}/python3-%{name}-%{version}-%{release}
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user