diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8682282..09b5abd 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,3 +1,3 @@ -mtime: 1731945922 -commit: 3881af0f5a6e053b9069c853358318cf8320efb2fb761781079828ea4737656c +mtime: 1732119982 +commit: 6f7127ad4924a93508fb1987e85f2a104f8eabe566e3cdaeb88af73312e90f9e url: https://src.opensuse.org/nodejs/nodejs22.git diff --git a/nodejs22.changes b/nodejs22.changes index acaa8a5..7a8df76 100644 --- a/nodejs22.changes +++ b/nodejs22.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 20 10:04:23 UTC 2024 - Adam Majer + +- BuildRequire python311 for SLE15 + ------------------------------------------------------------------- Mon Nov 18 12:02:26 UTC 2024 - Adam Majer diff --git a/nodejs22.spec b/nodejs22.spec index 2f6d3a8..c896c33 100644 --- a/nodejs22.spec +++ b/nodejs22.spec @@ -240,12 +240,19 @@ BuildRequires: gcc-c++ # Python dependencies %if %node_version_number >= 14 -%if 0%{?suse_version} && 0%{?suse_version} < 1500 +%if 0%{?suse_version} +%if 0%{?suse_version} < 1500 BuildRequires: python36 %define forced_python_version 3.6m -%else +%endif +%if %{?suse_version} == 1500 +BuildRequires: python311 +%define forced_python_version 3.11 +%endif +%if %{?suse_version} > 1500 BuildRequires: python3 %endif +%endif %else %if %node_version_number >= 12 @@ -945,6 +952,7 @@ rm test/parallel/test-strace-openat-openssl.js %if 0%{?forced_python_version:1} sed -i -e "s,'python3','python%{forced_python_version}'," test/parallel/test-child-process-set-blocking.js test -e tools/pseudo-tty.py && sed -i -e "s,^#!/usr/bin/env python3$,#!/usr/bin/python%{forced_python_version}," tools/pseudo-tty.py ||: +export PYTHON="/usr/bin/python%{forced_python_version}" %endif ln addon-rpm.gypi deps/npm/node_modules/node-gyp/addon-rpm.gypi