From 39e27dd06eb5a6d6bfda52ed0b0509c94f6b0ff0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 3 Apr 2024 11:02:56 -0400 Subject: [PATCH] Update to 20.12.1 Signed-off-by: Stephen Gallagher --- nodejs20.spec | 11 ++++++++--- packaging/nodejs.spec.j2 | 5 +++++ sources | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nodejs20.spec b/nodejs20.spec index 5af5bfe..03bb49f 100644 --- a/nodejs20.spec +++ b/nodejs20.spec @@ -30,7 +30,7 @@ %global nodejs_epoch 1 %global nodejs_major 20 %global nodejs_minor 12 -%global nodejs_patch 0 +%global nodejs_patch 1 # nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h %global nodejs_soversion 115 %global nodejs_abi %{nodejs_soversion} @@ -71,7 +71,7 @@ %global c_ares_version 1.27.0 # llhttp - from deps/llhttp/include/llhttp.h -%global llhttp_version 8.1.1 +%global llhttp_version 8.1.2 # libuv - from deps/uv/include/uv/version.h %global libuv_version 1.46.0 @@ -323,7 +323,7 @@ Provides: bundled(ada) = 2.7.6 # undici and cjs-module-lexer ship with pre-built WASM binaries. %if %{with bootstrap} Provides: bundled(nodejs-cjs-module-lexer) = 1.2.2 -Provides: bundled(nodejs-undici) = 5.28.3 +Provides: bundled(nodejs-undici) = 5.28.4 %else BuildRequires: nodejs-cjs-module-lexer nodejs-undici Requires: nodejs-cjs-module-lexer nodejs-undici @@ -580,7 +580,12 @@ export PATH="${cwd}/.bin:$PATH" # The ninja build does not put the shared library in the expected location, so # we will move it. mv out/Release/lib/libnode.so.%{nodejs_soversion} out/Release/ + +%if 0%{?nodejs_major} >= 20 ./tools/install.py install --dest-dir %{buildroot} --prefix %{_prefix} +%else +./tools/install.py install %{buildroot} %{_prefix} +%endif # own the sitelib directory diff --git a/packaging/nodejs.spec.j2 b/packaging/nodejs.spec.j2 index 27fec7e..82b338e 100644 --- a/packaging/nodejs.spec.j2 +++ b/packaging/nodejs.spec.j2 @@ -592,7 +592,12 @@ export PATH="${cwd}/.bin:$PATH" # The ninja build does not put the shared library in the expected location, so # we will move it. mv out/Release/lib/libnode.so.%{nodejs_soversion} out/Release/ + +%if 0%{?nodejs_major} >= 20 ./tools/install.py install --dest-dir %{buildroot} --prefix %{_prefix} +%else +./tools/install.py install %{buildroot} %{_prefix} +%endif # own the sitelib directory diff --git a/sources b/sources index fb71c00..9a3f73c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (node-v20.12.0-stripped.tar.gz) = 7f83dfb0b0b5cea788dec91ed56c346cafd90045373375483416c900fd8aab5b8374b3a5b9ae7b5266fda2c6ebf4d78944c211ef09bdfa5afa3dec8ba5cb4c4d +SHA512 (node-v20.12.1-stripped.tar.gz) = f51f47ba14818787ef8342c0715c47fd8639f4329ae7b361d92b18611d255c5b56bbb315acb1ef2925038b5515ff7532a29ec777334c8fee6be615110dbffe28 SHA512 (icu4c-74_2-data-bin-b.zip) = 76cc9a684be584ce2bd674b40191975a7506ef14c9c7a08cfe0a09d28c90e49529a2eb01baf698cf27895bec9f8fdf6b76c1d1bd010607fac04be7d12e954e50 SHA512 (icu4c-74_2-data-bin-l.zip) = 6ef1554c0af06cec777c454cbbeaca44884b8db028d777311323d44e5697a7638df394cfc53760ddcdab763d975f24043f47ac4828e20c9774b4108030a7be15