From 573f204607a68d7dab56097adc53b9ad3ec7d54f Mon Sep 17 00:00:00 2001 From: Zuzana Svetlikova Date: Thu, 29 Jun 2017 13:17:05 +0200 Subject: [PATCH] Update to 6.11.0 --- .gitignore | 1 + nodejs.spec | 18 +++++++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e92f336..863b931 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /node-v6.10.1-stripped.tar.gz /node-v6.10.2-stripped.tar.gz /node-v6.10.3-stripped.tar.gz +/node-v6.11.0-stripped.tar.gz diff --git a/nodejs.spec b/nodejs.spec index 0c01718..65829e4 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -15,8 +15,8 @@ # than a Fedora release lifecycle. %global nodejs_epoch 1 %global nodejs_major 6 -%global nodejs_minor 10 -%global nodejs_patch 3 +%global nodejs_minor 11 +%global nodejs_patch 0 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} %global nodejs_release 1 @@ -26,7 +26,7 @@ %global v8_major 5 %global v8_minor 1 %global v8_build 281 -%global v8_patch 101 +%global v8_patch 102 # 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} @@ -93,7 +93,8 @@ Patch2: 0002-Use-openssl-1.0.1.patch # use system certificates instead of the bundled ones # Backported from upstream 7.5.0+ -Patch3: 0003-crypto-Use-system-CAs-instead-of-using-bundled-ones.patch +# merged in 6.11.0 +#Patch3: 0003-crypto-Use-system-CAs-instead-of-using-bundled-ones.patch # Backported upstream patch to allow building with GCC 7 from # https://github.com/nodejs/node/commit/2bbee49e6f170a5d6628444a7c9a2235fe0dd929 @@ -106,6 +107,7 @@ Patch5: EPEL01-openssl101-compat.patch BuildRequires: python-devel BuildRequires: libuv-devel >= 1:1.9.1 Requires: libuv >= 1:1.9.1 +Requires: http-parser >= 2.7.0 BuildRequires: libicu-devel BuildRequires: zlib-devel BuildRequires: gcc >= 4.8.0 @@ -186,6 +188,7 @@ Summary: JavaScript runtime - development headers Group: Development/Languages Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: libuv-devel%{?_isa} +Requires: http-parser-devel${?_isa} Requires: openssl-devel%{?_isa} Requires: zlib-devel%{?_isa} Requires: nodejs-packaging @@ -240,7 +243,7 @@ rm -rf deps/http-parser \ deps/zlib # Use system CA certificates -%patch3 -p1 +#%patch3 -p1 # Fix GCC7 build %patch4 -p1 @@ -418,6 +421,11 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Thu Jun 29 2017 Zuzana Svetlikova - 1:6.11.0-1 +- Update to 6.11.0 +- https://nodejs.org/en/blog/release/v6.10.3/ +- explicitly depend on http-parser (RHBZ#1457763) + * Wed May 10 2017 Stephen Gallagher - 1:6.10.3-1 - Update to 6.10.3 (LTS) - https://nodejs.org/en/blog/release/v6.10.3/ diff --git a/sources b/sources index fee1521..faa059a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (node-v6.10.3-stripped.tar.gz) = 0750e6c1597c2379df59fafb5945d3af7d59f371c7996c56394f0cac5361627cebde3f6e46468ef76b0eb6d242e77538ec0c8136f75b98c140f1c6235df596bd +SHA512 (node-v6.11.0-stripped.tar.gz) = ad7602bea476367ea2a202367e62ed5bdb67dfcd4b1515b4df618d33ceb31f1b88206c63623718f9b43d01d53033602c56ca34ac846e4143a3e4499f8e54a617