[packages/spice-space] - switch to python 3.x
hawk
hawk at pld-linux.org
Sat Jul 22 17:03:12 CEST 2023
commit 687edfb2fd8e7b0bdc29031e8718b56fce2eb855
Author: Marcin Krol <hawk at tld-linux.org>
Date: Sat Jul 22 16:26:03 2023 +0200
- switch to python 3.x
python3.patch | 27 +++++++++++++++++++++++++++
spice-space.spec | 8 +++++---
2 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/spice-space.spec b/spice-space.spec
index 99224cc..e650853 100644
--- a/spice-space.spec
+++ b/spice-space.spec
@@ -14,6 +14,7 @@ License: LGPL v2.1+
Group: Applications/Emulators
Source0: https://www.spice-space.org/download/releases/spice-server/spice-%{version}.tar.bz2
# Source0-md5: 1de1e9157a1e2396884017978e7cf086
+Patch0: python3.patch
URL: https://www.spice-space.org/
%{?with_opengl:BuildRequires: OpenGL-GLU-devel}
%{?with_opengl:BuildRequires: OpenGL-devel}
@@ -38,9 +39,9 @@ BuildRequires: opus-devel >= 1.0.0
BuildRequires: orc-devel >= 0.4
BuildRequires: pixman-devel >= 0.17.7
BuildRequires: pkgconfig
-BuildRequires: python >= 2
-BuildRequires: python-pyparsing
-BuildRequires: python-six
+BuildRequires: python3
+BuildRequires: python3-pyparsing
+BuildRequires: python3-six
BuildRequires: rpmbuild(macros) >= 1.527
BuildRequires: spice-protocol >= 0.14.3
BuildRequires: xorg-lib-libX11-devel
@@ -115,6 +116,7 @@ Statyczna biblioteka serwera SPICE.
%prep
%setup -q -n spice-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..c0fcf77
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,27 @@
+diff -ur spice-0.15.2.orig/subprojects/spice-common/m4/spice-deps.m4 spice-0.15.2/subprojects/spice-common/m4/spice-deps.m4
+--- spice-0.15.2.orig/subprojects/spice-common/m4/spice-deps.m4 2023-05-12 10:37:16.000000000 +0200
++++ spice-0.15.2/subprojects/spice-common/m4/spice-deps.m4 2023-07-22 16:21:54.669050493 +0200
+@@ -152,22 +152,14 @@
+ [enable_python_checks="no"])
+ if test "x$enable_python_checks" != "xno"; then
+ AS_IF([test -n "$PYTHON"], # already set required PYTHON version
+- [AM_PATH_PYTHON
+- AX_PYTHON_MODULE([six], [1])
+- AX_PYTHON_MODULE([pyparsing], [1])],
+ [PYTHON=python3
+ AX_PYTHON_MODULE([six])
+ AX_PYTHON_MODULE([pyparsing])
+ test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING" = "yes"],
+ [AM_PATH_PYTHON([3])],
+- [PYTHON=python2
+- AX_PYTHON_MODULE([six])
+- AX_PYTHON_MODULE([pyparsing])
+- test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING" = "yes"],
+- [AM_PATH_PYTHON([2])],
+ [AC_MSG_ERROR([Python modules six and pyparsing are required])])
+ else
+- AM_PATH_PYTHON
++ AM_PATH_PYTHON([3])
+ fi
+ ])
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/spice-space.git/commitdiff/687edfb2fd8e7b0bdc29031e8718b56fce2eb855
More information about the pld-cvs-commit
mailing list