diff --git a/.gitignore b/.gitignore index 3bc7e0b..48f5536 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/node-v12.13.1-stripped.tar.gz +SOURCES/node-v12.14.1-stripped.tar.gz diff --git a/.nodejs.metadata b/.nodejs.metadata index 1598e82..a7d1028 100644 --- a/.nodejs.metadata +++ b/.nodejs.metadata @@ -1 +1 @@ -682aca11ed71b4dc7d78471d46f7254c64e005ad SOURCES/node-v12.13.1-stripped.tar.gz +dc09c388f77fa34f9d711f01e60c9784e9c23504 SOURCES/node-v12.14.1-stripped.tar.gz diff --git a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch index ddd7512..79dc997 100644 --- a/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch +++ b/SOURCES/0001-Disable-running-gyp-on-shared-deps.patch @@ -1,29 +1,25 @@ -From 80542232e5b9c3ede63b7a70c1077497e130da81 Mon Sep 17 00:00:00 2001 +From 4509b10cbe5d22216a7880cc7fb6bd5f92b18018 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 27 Apr 2017 14:25:42 +0200 -Subject: [PATCH 1/3] Disable running gyp on shared deps +Subject: [PATCH 1/5] Disable running gyp on shared deps --- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 0a5177d1c3e7d6769535d79e063f987157a30f4d..1f3dd0abe4031defb5b7cc817b12886bdea002c7 100644 +index 56f5358..f289f25 100644 --- a/Makefile +++ b/Makefile -@@ -141,9 +141,9 @@ test-code-cache: with-code-cache - echo "'test-code-cache' target is a noop" +@@ -141,7 +141,7 @@ test-code-cache: with-code-cache + echo "'test-code-cache' target is a noop" out/Makefile: config.gypi common.gypi node.gyp \ - deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ -- tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ -- tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp -+ deps/http_parser/http_parser.gyp \ -+ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ -+ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp - $(PYTHON) tools/gyp_node.py -f make - - # node_version.h is listed because the N-API version is taken from there ++ deps/http_parser/http_parser.gyp \ + tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \ + tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp + $(PYTHON) tools/gyp_node.py -f make -- -2.23.0 +2.24.1 diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec index dcd7e42..060187c 100644 --- a/SPECS/nodejs.spec +++ b/SPECS/nodejs.spec @@ -21,7 +21,7 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 12 -%global nodejs_minor 13 +%global nodejs_minor 14 %global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %if %{?with_libs} == 1 @@ -58,9 +58,9 @@ %global http_parser_version %{http_parser_major}.%{http_parser_minor}.%{http_parser_patch} # llhttp - from deps/llhttp/include/llhttp.h -%global llhttp_major 1 -%global llhttp_minor 1 -%global llhttp_patch 4 +%global llhttp_major 2 +%global llhttp_minor 0 +%global llhttp_patch 1 %global llhttp_version %{llhttp_major}.%{llhttp_minor}.%{llhttp_patch} # libuv - from deps/uv/include/uv/version.h @@ -71,8 +71,8 @@ # nghttp2 - from deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h %global nghttp2_major 1 -%global nghttp2_minor 39 -%global nghttp2_patch 2 +%global nghttp2_minor 40 +%global nghttp2_patch 0 %global nghttp2_version %{nghttp2_major}.%{nghttp2_minor}.%{nghttp2_patch} # ICU - from tools/icu/current_ver.dep @@ -101,8 +101,8 @@ # npm - from deps/npm/package.json %global npm_epoch 1 %global npm_major 6 -%global npm_minor 12 -%global npm_patch 1 +%global npm_minor 13 +%global npm_patch 4 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch} # In order to avoid needing to keep incrementing the release version for the @@ -258,7 +258,6 @@ Requires: nodejs-packaging %if %{with bootstrap} # deps are bundled %else -Requires: http-parser-devel%{?_isa} Requires: libuv-devel%{?_isa} %endif @@ -275,7 +274,8 @@ Summary: Node.js and v8 libraries Provides: libv8.so.%{v8_major}()(64bit) Provides: libv8_libbase.so.%{v8_major}()(64bit) Provides: libv8_libplatform.so.%{v8_major}()(64bit) -%else # 32-bits +%else +# 32-bits Provides: libv8.so.%{v8_major} Provides: libv8_libbase.so.%{v8_major} Provides: libv8_libplatform.so.%{v8_major} @@ -501,9 +501,6 @@ rm -f %{buildroot}%{_pkgdocdir}/html/nodejs.1 mkdir -p %{buildroot}%{_datadir}/node cp -p common.gypi %{buildroot}%{_datadir}/node -# Install the GDB init tool into the documentation directory -mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit - # install NPM docs to mandir mkdir -p %{buildroot}%{_mandir} \ %{buildroot}%{_pkgdocdir}/npm @@ -512,14 +509,14 @@ cp -pr deps/npm/man/* %{buildroot}%{_mandir}/ rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/man ln -sf %{_mandir} %{buildroot}%{_prefix}/lib/node_modules/npm/man -# Install Markdown and HTML documentation to %{_pkgdocdir} -cp -pr deps/npm/html deps/npm/doc %{buildroot}%{_pkgdocdir}/npm/ -rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/html \ - %{buildroot}%{_prefix}/lib/node_modules/npm/doc +# Install Gatsby HTML documentation to %{_pkgdocdir} +cp -pr deps/npm/docs %{buildroot}%{_pkgdocdir}/npm/ +rm -rf %{buildroot}%{_prefix}/lib/node_modules/npm/docs -ln -sf %{_pkgdocdir} %{buildroot}%{_prefix}/lib/node_modules/npm/html -ln -sf %{_pkgdocdir}/npm/html %{buildroot}%{_prefix}/lib/node_modules/npm/doc +ln -sf %{_pkgdocdir}/npm %{buildroot}%{_prefix}/lib/node_modules/npm/docs +# Install the GDB init tool into the documentation directory +mv %{buildroot}/%{_datadir}/doc/node/gdbinit %{buildroot}/%{_pkgdocdir}/gdbinit # Node tries to install some python files into a documentation directory # (and not the proper one). Remove them for now until we figure out what to @@ -708,21 +705,36 @@ end %{_prefix}/lib/node_modules/npm %ghost %{_sysconfdir}/npmrc %ghost %{_sysconfdir}/npmignore -%doc %{_mandir}/man*/npm* -%doc %{_mandir}/man*/npx* -%doc %{_mandir}/man5/package.json.5* -%doc %{_mandir}/man5/package-lock.json.5* -%doc %{_mandir}/man7/removing-npm.7* +%doc %{_mandir}/man1/npm*.1* +%doc %{_mandir}/man1/npx.1* +%doc %{_mandir}/man5/folders.5* +%doc %{_mandir}/man5/install.5* +%doc %{_mandir}/man5/npmrc.5* +%doc %{_mandir}/man5/package-json.5* +%doc %{_mandir}/man5/package-lock-json.5* +%doc %{_mandir}/man5/package-locks.5* +%doc %{_mandir}/man5/shrinkwrap-json.5* +%doc %{_mandir}/man7/config.7* +%doc %{_mandir}/man7/developers.7* +%doc %{_mandir}/man7/disputes.7* +%doc %{_mandir}/man7/orgs.7* +%doc %{_mandir}/man7/registry.7* +%doc %{_mandir}/man7/removal.7* +%doc %{_mandir}/man7/scope.7* +%doc %{_mandir}/man7/scripts.7* %doc %{_mandir}/man7/semver.7* %files docs %dir %{_pkgdocdir} %{_pkgdocdir}/html -%{_pkgdocdir}/npm/html -%{_pkgdocdir}/npm/doc +%{_pkgdocdir}/npm/docs + %changelog +* Wed Jan 15 2020 Jan Staněk - 1:12.14.1-1 +- Rebase to 12.14.1 + * Fri Nov 29 2019 Zuzana Svetlikova - 1:12.13.1-1 - Resolves: RHBZ# 1773503, update to 12.13.1 - minor clean up and sync with Fedora spec