!33 fix libproxy compile error based on python3.10
From: @yangl777 Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
commit
7687d2d9f5
58
backport-libproxy-0.4.17-fix-python-version-check.patch
Normal file
58
backport-libproxy-0.4.17-fix-python-version-check.patch
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
From 04eeeabb42436cb58e9bac2f6c31c0fb87905a72 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David King <amigadave@amigadave.com>
|
||||||
|
Date: Mon, 21 Jun 2021 17:10:43 +0100
|
||||||
|
Subject: [PATCH] python: Support Python 3.10 and above
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
As suggested by Miro Hrončok, change the way that the Python interpreter
|
||||||
|
version is found. Additionally, update the static list of accepted
|
||||||
|
Python 3 versions.
|
||||||
|
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=1898060
|
||||||
|
---
|
||||||
|
bindings/python/python2/CMakeLists.txt | 2 +-
|
||||||
|
bindings/python/python3/CMakeLists.txt | 2 +-
|
||||||
|
cmake/FindPython3Interp.cmake | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/bindings/python/python2/CMakeLists.txt b/bindings/python/python2/CMakeLists.txt
|
||||||
|
index 00df551..f4d2b91 100644
|
||||||
|
--- a/bindings/python/python2/CMakeLists.txt
|
||||||
|
+++ b/bindings/python/python2/CMakeLists.txt
|
||||||
|
@@ -6,7 +6,7 @@ if(PYTHON2INTERP_FOUND)
|
||||||
|
if(NOT PYTHON2_SITEPKG_DIR)
|
||||||
|
execute_process(COMMAND
|
||||||
|
${PYTHON2_EXECUTABLE}
|
||||||
|
- -c "import sys; print (sys.version[0:3])"
|
||||||
|
+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))"
|
||||||
|
OUTPUT_VARIABLE PYTHON2_VERSION
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
|
diff --git a/bindings/python/python3/CMakeLists.txt b/bindings/python/python3/CMakeLists.txt
|
||||||
|
index bf87dfc..fc3b24b 100644
|
||||||
|
--- a/bindings/python/python3/CMakeLists.txt
|
||||||
|
+++ b/bindings/python/python3/CMakeLists.txt
|
||||||
|
@@ -6,7 +6,7 @@ if(PYTHON3INTERP_FOUND)
|
||||||
|
if(NOT PYTHON3_SITEPKG_DIR)
|
||||||
|
execute_process(COMMAND
|
||||||
|
${PYTHON3_EXECUTABLE}
|
||||||
|
- -c "import sys; print (sys.version[0:3])"
|
||||||
|
+ -c "import sys; print('{}.{}'.format(*sys.version_info[0:2]))"
|
||||||
|
OUTPUT_VARIABLE PYTHON3_VERSION
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
|
diff --git a/cmake/FindPython3Interp.cmake b/cmake/FindPython3Interp.cmake
|
||||||
|
index 74398b2..5b25e5a 100644
|
||||||
|
--- a/cmake/FindPython3Interp.cmake
|
||||||
|
+++ b/cmake/FindPython3Interp.cmake
|
||||||
|
@@ -39,7 +39,7 @@
|
||||||
|
|
||||||
|
unset(_Python3_NAMES)
|
||||||
|
|
||||||
|
-set(_Python3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||||
|
+set(_Python3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
|
||||||
|
|
||||||
|
if(Python3Interp_FIND_VERSION)
|
||||||
|
if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: libproxy
|
Name: libproxy
|
||||||
Version: 0.4.17
|
Version: 0.4.17
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Libproxy is a library that provides automatic proxy configuration management
|
Summary: Libproxy is a library that provides automatic proxy configuration management
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
@ -9,6 +9,8 @@ Source0: https://github.com/libproxy/%{name}/archive/%{version}.tar.gz#/%
|
|||||||
# Source1 comes from the Debian package.
|
# Source1 comes from the Debian package.
|
||||||
Source1: proxy.1
|
Source1: proxy.1
|
||||||
|
|
||||||
|
Patch6000: backport-libproxy-0.4.17-fix-python-version-check.patch
|
||||||
|
|
||||||
BuildRequires: cmake >= 2.6.0 gcc-c++
|
BuildRequires: cmake >= 2.6.0 gcc-c++
|
||||||
BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(libnm) python3-devel
|
BuildRequires: pkgconfig(gio-2.0) >= 2.26 pkgconfig(libnm) python3-devel
|
||||||
BuildRequires: pkgconfig(dbus-1) pkgconfig(javascriptcoregtk-4.0)
|
BuildRequires: pkgconfig(dbus-1) pkgconfig(javascriptcoregtk-4.0)
|
||||||
@ -104,6 +106,12 @@ make test
|
|||||||
%{_mandir}/man1/proxy.1*
|
%{_mandir}/man1/proxy.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Apr 16 2022 yanglu <yanglu72@h-partners.com> - 0.4.17-2
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix libproxy compile error based on python3.10
|
||||||
|
|
||||||
* Thu Jan 28 2021 xihaochen <xihaochen@huawei.com> - 0.4.17-1
|
* Thu Jan 28 2021 xihaochen <xihaochen@huawei.com> - 0.4.17-1
|
||||||
- Type:requirements
|
- Type:requirements
|
||||||
- Id:NA
|
- Id:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user