From d9fbecd59ec0c0237a9a0ceb9c61e2392b92c9ba Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 21 Sep 2017 10:57:40 +0200 Subject: [PATCH 1/4] Adjust spec for MBS --- nodejs.spec | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 3d96d75..5000159 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,6 +1,7 @@ %global with_debug 1 -%{!?_with_bootstrap: %global bootstrap 0} +# bundle some dependencies missing in Modularity +%{!?_with_bootstrap: %global bootstrap 1} %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -45,6 +46,12 @@ %global http_parser_patch 0 %global http_parser_version %{http_parser_major}.%{http_parser_minor}.%{http_parser_patch} +# libuv - from deps/uv/include/uv-version.h +%global libuv_major 1 +%global libuv_minor 14 +%global libuv_patch 1 +%global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} + # punycode - from lib/punycode.js # Note: this was merged into the mainline since 0.6.x # Note: this will be unmerged in v7 or v8 @@ -96,25 +103,25 @@ Source7: nodejs_native.attr # Disable running gyp on bundled deps we don't use Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch -BuildRequires: python-devel -BuildRequires: libuv-devel >= 1:1.9.1 -Requires: libuv >= 1:1.9.1 -BuildRequires: libicu-devel -BuildRequires: zlib-devel BuildRequires: gcc >= 4.8.0 BuildRequires: gcc-c++ >= 4.8.0 %if ! 0%{?bootstrap} BuildRequires: systemtap-sdt-devel BuildRequires: http-parser-devel >= 2.7.0 +BuildRequires: libicu-devel +BuildRequires: zlib-devel +BuildRequires: python2-devel +BuildRequires: compat-openssl10-devel >= 1:1.0.2 +BuildRequires: libuv-devel >= 1:1.9.1 +Requires: libuv >= 1:1.9.1 %else Provides: bundled(http-parser) = %{http_parser_version} -%endif - -%if 0%{?fedora} > 25 -BuildRequires: compat-openssl10-devel >= 1:1.0.2 -%else -BuildRequires: openssl-devel >= 1:1.0.2 +Provides: bundled(libuv) = %{libuv_version} +BuildRequires: python2 +BuildRequires: libicu +BuildRequires: zlib +BuildRequires: compat-openssl10 %endif # we need the system certificate store when Patch2 is applied @@ -160,6 +167,7 @@ Provides: bundled(c-ares) = %{c_ares_version} # See https://github.com/nodejs/node/commit/d726a177ed59c37cf5306983ed00ecd858cfbbef Provides: bundled(v8) = %{v8_version} +%if ! 0%{?bootstrap} # Make sure we keep NPM up to date when we update Node.js %if 0%{?epel} # EPEL doesn't support Recommends, so make it strict @@ -167,6 +175,7 @@ Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %else Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %endif +%endif %description @@ -180,12 +189,12 @@ real-time applications that run across distributed devices. Summary: JavaScript runtime - development headers Group: Development/Languages Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} -Requires: libuv-devel%{?_isa} Requires: openssl-devel%{?_isa} Requires: zlib-devel%{?_isa} Requires: nodejs-packaging %if ! 0%{?bootstrap} Requires: http-parser-devel%{?_isa} +Requires: libuv-devel%{?_isa} %endif %description devel @@ -268,7 +277,6 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" ./configure --prefix=%{_prefix} \ --shared-openssl \ --shared-zlib \ - --shared-libuv \ --without-dtrace \ --with-intl=system-icu \ --openssl-use-def-ca-store @@ -419,6 +427,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Sep 21 2017 Zuzana Svetlikova - 1:6:11.3-2 +- Adjust spec for modularity + * Thu Sep 07 2017 Zuzana Svetlikova - 1:6.11.3-1 - Update to 6.11.3 - https://nodejs.org/en/blog/release/v6.11.3/ From 46c283bc0f9827c795b971ff23529cb31512c261 Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Mon, 25 Sep 2017 14:11:27 +0200 Subject: [PATCH 2/4] Fix dependencies in bootstrap --- nodejs.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 5000159..4067296 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -22,7 +22,7 @@ %global nodejs_patch 3 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 1 +%global nodejs_release 2 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -103,25 +103,26 @@ Source7: nodejs_native.attr # Disable running gyp on bundled deps we don't use Patch1: 0001-Disable-running-gyp-files-for-bundled-deps.patch +BuildRequires: python2-devel +BuildRequires: libicu-devel +BuildRequires: zlib-devel BuildRequires: gcc >= 4.8.0 BuildRequires: gcc-c++ >= 4.8.0 %if ! 0%{?bootstrap} BuildRequires: systemtap-sdt-devel BuildRequires: http-parser-devel >= 2.7.0 -BuildRequires: libicu-devel -BuildRequires: zlib-devel -BuildRequires: python2-devel -BuildRequires: compat-openssl10-devel >= 1:1.0.2 BuildRequires: libuv-devel >= 1:1.9.1 Requires: libuv >= 1:1.9.1 %else Provides: bundled(http-parser) = %{http_parser_version} Provides: bundled(libuv) = %{libuv_version} -BuildRequires: python2 -BuildRequires: libicu -BuildRequires: zlib -BuildRequires: compat-openssl10 +%endif + +%if 0%{?fedora} > 25 +BuildRequires: compat-openssl10-devel >= 1:1.0.2 +%else +BuildRequires: openssl-devel >= 1:1.0.2 %endif # we need the system certificate store when Patch2 is applied @@ -242,7 +243,6 @@ The API documentation for the Node.js JavaScript runtime. # remove bundled dependencies that we aren't building %patch1 -p1 rm -rf deps/icu-small \ - deps/uv \ deps/zlib %build From 9eb87fbf58a8144df30a3bdf144ce9a5be79bfce Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 6 Oct 2017 22:50:11 +0200 Subject: [PATCH 3/4] Update, use bcond macro --- .gitignore | 1 + nodejs.spec | 50 ++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index acb9286..9105bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /node-v6.11.1-stripped.tar.gz /node-v6.11.2-stripped.tar.gz /node-v6.11.3-stripped.tar.gz +/node-v6.11.4-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 4067296..452e510 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,7 +1,8 @@ %global with_debug 1 # bundle some dependencies missing in Modularity -%{!?_with_bootstrap: %global bootstrap 1} +#%{!?_with_bootstrap: %global bootstrap 1} +%bcond_with bootstrap %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -19,17 +20,17 @@ %global nodejs_epoch 1 %global nodejs_major 6 %global nodejs_minor 11 -%global nodejs_patch 3 +%global nodejs_patch 4 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 2 +%global nodejs_release 1 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h %global v8_major 5 %global v8_minor 1 %global v8_build 281 -%global v8_patch 107 +%global v8_patch 108 # V8 presently breaks ABI at least every x.y release while never bumping SONAME %global v8_abi %{v8_major}.%{v8_minor} %global v8_version %{v8_major}.%{v8_minor}.%{v8_build}.%{v8_patch} @@ -48,8 +49,8 @@ # libuv - from deps/uv/include/uv-version.h %global libuv_major 1 -%global libuv_minor 14 -%global libuv_patch 1 +%global libuv_minor 11 +%global libuv_patch 0 %global libuv_version %{libuv_major}.%{libuv_minor}.%{libuv_patch} # punycode - from lib/punycode.js @@ -109,14 +110,16 @@ BuildRequires: zlib-devel BuildRequires: gcc >= 4.8.0 BuildRequires: gcc-c++ >= 4.8.0 -%if ! 0%{?bootstrap} +#%if ! 0%{?bootstrap} +%if %{with bootstrap} +Provides: bundled(http-parser) = %{http_parser_version} +Provides: bundled(libuv) = %{libuv_version} +%else BuildRequires: systemtap-sdt-devel BuildRequires: http-parser-devel >= 2.7.0 BuildRequires: libuv-devel >= 1:1.9.1 Requires: libuv >= 1:1.9.1 -%else -Provides: bundled(http-parser) = %{http_parser_version} -Provides: bundled(libuv) = %{libuv_version} + %endif %if 0%{?fedora} > 25 @@ -168,15 +171,12 @@ Provides: bundled(c-ares) = %{c_ares_version} # See https://github.com/nodejs/node/commit/d726a177ed59c37cf5306983ed00ecd858cfbbef Provides: bundled(v8) = %{v8_version} -%if ! 0%{?bootstrap} -# Make sure we keep NPM up to date when we update Node.js %if 0%{?epel} # EPEL doesn't support Recommends, so make it strict Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %else Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %endif -%endif %description @@ -193,7 +193,10 @@ Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: openssl-devel%{?_isa} Requires: zlib-devel%{?_isa} Requires: nodejs-packaging -%if ! 0%{?bootstrap} +#%if ! 0%{?bootstrap} +%if %{with bootstrap} +#deps are bundled +%else Requires: http-parser-devel%{?_isa} Requires: libuv-devel%{?_isa} %endif @@ -264,20 +267,21 @@ export CXXFLAGS='%{optflags} -g \ export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' ' ')" export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' ' ')" -%if ! 0%{?bootstrap} +#%if ! 0%{?bootstrap} +%if %{with bootstrap} ./configure --prefix=%{_prefix} \ --shared-openssl \ --shared-zlib \ - --shared-libuv \ - --shared-http-parser \ - --with-dtrace \ + --without-dtrace \ --with-intl=system-icu \ --openssl-use-def-ca-store %else ./configure --prefix=%{_prefix} \ --shared-openssl \ --shared-zlib \ - --without-dtrace \ + --shared-libuv \ + --shared-http-parser \ + --with-dtrace \ --with-intl=system-icu \ --openssl-use-def-ca-store %endif @@ -388,7 +392,8 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %dir %{_datadir}/systemtap/tapset %{_datadir}/systemtap/tapset/node.stp -%if ! 0%{?bootstrap} +#%if ! 0%{?bootstrap} +%if %{with bootstrap} %dir %{_usr}/lib/dtrace %{_usr}/lib/dtrace/node.d %endif @@ -427,6 +432,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Fri Oct 06 2017 Zuzana Svetlikova - 1:6.11.4-1 +- Update to 6.11.4 +- https://nodejs.org/en/blog/release/v6.11.3/ +- use bcond macro + * Thu Sep 21 2017 Zuzana Svetlikova - 1:6:11.3-2 - Adjust spec for modularity diff --git a/sources b/sources index 4174557..3b66adf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v6.11.3-stripped.tar.gz) = 7e1e60d42d197c4634dd3d79888ea3cffa580bdbb8db1ec359a5d6277504bc013dd22b3a2c33cf957b4a858a3bcdc4e3752ab42b821e3c504887ade40286655a +SHA512 (node-v6.11.4-stripped.tar.gz) = 94d4759744dd61288a3c352ca6050954c0716772c19cd281a927a9702f9e41fdbdbcf310183e43c734187192d97817cbb1f1c203f47b400c60550a5da78fead6 From 73320d106322ac83a867a79a1446f54c63bdc96a Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Fri, 6 Oct 2017 23:36:06 +0200 Subject: [PATCH 4/4] Add missing else --- nodejs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs.spec b/nodejs.spec index 452e510..755d4f3 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -394,6 +394,8 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - #%if ! 0%{?bootstrap} %if %{with bootstrap} +#no dtrace +%else %dir %{_usr}/lib/dtrace %{_usr}/lib/dtrace/node.d %endif