From 8dbd715bd3b838fe8d2a883596b2a2b725b72e6b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 17 2019 12:11:44 +0000
Subject: import rh-nodejs10-nodejs-10.10.0-3.el7


---

diff --git a/SPECS/nodejs.spec b/SPECS/nodejs.spec
index 2c6f018..233d7df 100644
--- a/SPECS/nodejs.spec
+++ b/SPECS/nodejs.spec
@@ -23,7 +23,7 @@
 %global nodejs_patch 0
 %global nodejs_abi %{nodejs_major}.%{nodejs_minor}
 %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}
-%global nodejs_release 2
+%global nodejs_release 3
 
 # == Bundled Dependency Versions ==
 # v8 - from deps/v8/include/v8-version.h
@@ -67,6 +67,13 @@
 %global npm_patch 1
 %global npm_version %{npm_major}.%{npm_minor}.%{npm_patch}
 
+# zlib version - from deps/zlib/CMakeLists.txt
+# Note: Only required/bundled on RHEL-7
+%global zlib_major 1
+%global zlib_minor 2
+%global zlib_patch 11
+%global zlib_version %{zlib_major}.%{zlib_minor}.%{zlib_patch}
+
 # In order to avoid needing to keep incrementing the release version for the
 # main package forever, we will just construct one for npm that is guaranteed
 # to increment safely. Changing this can only be done during an update when the
@@ -187,6 +194,9 @@ Provides: bundled(%{?scl_prefix}libuv) = %{libuv_version}
 # Node.js provides http2 support, but shared option is not yet available
 Provides: bundled(%{?scl_prefix}nghttp2) = 1.25.0
 
+# Bundle zlib on RHEL7, as the system version is too old
+Provides: bundled(%{?scl_prefix}zlib) = %{zlib_version}
+
 # Make sure we keep NPM up to date when we update Node.js
 Requires: %{?scl_prefix}npm = %{npm_version}-%{npm_release}%{?dist}
 
@@ -656,7 +666,7 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '  ')"
 %if ! 0%{?bootstrap}
 ./configure --prefix=%{_prefix} \
            --shared-openssl \
-           --shared-zlib \
+           %{?!el7:--shared-zlib} \
            --shared-http-parser \
            --with-dtrace \
            --debug-nghttp2 \
@@ -664,7 +674,7 @@ export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '  ')"
 %else
 ./configure --prefix=%{_prefix} \
            --shared-openssl \
-           --shared-zlib \
+           %{?!el7:--shared-zlib} \
            --with-dtrace \
            --debug-nghttp2 \
            --openssl-use-def-ca-store
@@ -835,6 +845,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
 
 
 %changelog
+* Thu Apr 04 2019 Jan Staněk <jstanek@redhat.com> - 10.10.0-3
+- Rebuild with bundled zlib
+- Resolves: rhbz#1696153
+
 * Wed Oct 31 2018 Zuzana Svetlikova <zsvetlik@redhat.com> - 10.10.0-2
 - Resolves: RHBZ#1584252
 - comment out native.req file to prevent conflict with other Node.js
@@ -911,7 +925,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node -
 - remove merged certs patch
 - build with updated system openssl
 - use fedora-style packaging, bundle npm and dependencies
-- bootstrap is modularity conditional to bundle http-parser 
+- bootstrap is modularity conditional to bundle http-parser
 - missing from base-runtime/shared-userspace
 - RHSCL 3.0 should be built for more arches