From 9eb87fbf58a8144df30a3bdf144ce9a5be79bfce Mon Sep 17 00:00:00 2001
From: Zuzana Svetlikova <zsvetlik@redhat.com>
Date: Fri, 6 Oct 2017 22:50:11 +0200
Subject: [PATCH] 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 <zsvetlik@redhat.com> - 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 <zsvetlik@redhat.com> - 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