forked from pool/virtualbox
- update python311.patch: remove changes that only work on
Tumbleweed OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=696
This commit is contained in:
parent
75e9780549
commit
a25f8dafa7
@ -24,30 +24,6 @@ Index: VirtualBox-7.0.8/src/VBox/Installer/linux/routines.sh
|
|||||||
if [ "`$p -c 'import sys
|
if [ "`$p -c 'import sys
|
||||||
if sys.version_info >= (2, 6) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)):
|
if sys.version_info >= (2, 6) and (sys.version_info < (3, 0) or sys.version_info >= (3, 3)):
|
||||||
print(\"test\")' 2> /dev/null`" != "test" ]; then
|
print(\"test\")' 2> /dev/null`" != "test" ]; then
|
||||||
Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
||||||
+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/gen_python_deps.py
|
|
||||||
@@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-3.0-only
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
import os,sys
|
|
||||||
-from distutils.version import StrictVersion
|
|
||||||
+from packaging import version
|
|
||||||
|
|
||||||
versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m" ]
|
|
||||||
prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
|
|
||||||
@@ -120,7 +120,7 @@ def main(argv):
|
|
||||||
realversion = v[:-1]
|
|
||||||
else:
|
|
||||||
realversion = v
|
|
||||||
- if StrictVersion(realversion) < StrictVersion('2.6'):
|
|
||||||
+ if version.parse(realversion) < version.parse('2.6'):
|
|
||||||
continue
|
|
||||||
for p in prefixes:
|
|
||||||
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
|
|
||||||
Index: VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk
|
--- VirtualBox-7.0.8.orig/src/libs/xpcom18a4/python/Makefile.kmk
|
||||||
+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
|
+++ VirtualBox-7.0.8/src/libs/xpcom18a4/python/Makefile.kmk
|
||||||
@@ -753,7 +753,7 @@ ifdef VBOX_PYTHONDEF_INC
|
@@ -753,7 +753,7 @@ ifdef VBOX_PYTHONDEF_INC
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun May 14 16:51:46 UTC 2023 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- update python311.patch: remove changes that only work on
|
||||||
|
Tumbleweed
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat May 13 20:07:37 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
|
Sat May 13 20:07:37 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
|
||||||
|
|
||||||
|
@ -475,9 +475,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v
|
|||||||
%patch36 -p1
|
%patch36 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch37 -p1
|
%patch37 -p1
|
||||||
%if 0%{?sle_version} > 150600
|
|
||||||
%patch38 -p1
|
%patch38 -p1
|
||||||
%endif
|
|
||||||
|
|
||||||
### Documents for virtualbox main package ###
|
### Documents for virtualbox main package ###
|
||||||
%if %{main_package}
|
%if %{main_package}
|
||||||
|
Loading…
Reference in New Issue
Block a user