From 528c58d440c59da5491f0d19c42b65868ba5785e Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 11:07:31 -0500 Subject: [PATCH 1/4] Bump revision and rebuild for s390x --- nodejs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 9bd5cf1..43aa963 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -19,7 +19,7 @@ %global nodejs_patch 1 %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 @@ -403,7 +403,10 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog -* Thu Oct 20 2016 Stephen Gallagher - - +* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-2 +- Bump revision and rebuild for s390x + +* Thu Oct 20 2016 Stephen Gallagher - 1:6.9.1-1 - Update to 6.9.1 LTS release - Fix a regression introduced in v6.8.0 in readable stream that caused unpipe to remove the wrong stream From 8dc35e41e08d53c8ece112eeab41e8eb084d9228 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 16:34:19 -0500 Subject: [PATCH 2/4] Fix incorrect Conflicts for nodejs-docs --- nodejs.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 43aa963..41f3a92 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -19,7 +19,7 @@ %global nodejs_patch 1 %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 @@ -224,8 +224,8 @@ BuildArch: noarch # We don't require that the main package be installed to # use the docs, but if it is installed, make sure the # version always matches -Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{release} -Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{release} +Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release} +Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release} %description docs The API documentation for the Node.js JavaScript runtime. @@ -403,6 +403,9 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog +* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-3 +- Fix incorrect Conflicts for nodejs-docs + * Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-2 - Bump revision and rebuild for s390x From 0665a4f9dc95d46435bc26a980a41c2d6cd0923a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 17:01:26 -0500 Subject: [PATCH 3/4] Fix incorrect Conflicts for nodejs-docs --- nodejs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 41f3a92..f0c2031 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -19,7 +19,7 @@ %global nodejs_patch 1 %global nodejs_abi %{nodejs_major}.%{nodejs_minor} %global nodejs_version %{nodejs_major}.%{nodejs_minor}.%{nodejs_patch} -%global nodejs_release 3 +%global nodejs_release 4 # == Bundled Dependency Versions == # v8 - from deps/v8/include/v8-version.h @@ -170,9 +170,9 @@ Provides: bundled(http-parser) = %{http_parser_version} # 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} +Requires: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %else -Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release} +Recommends: npm = %{npm_epoch}:%{npm_version}-%{npm_release}%{?dist} %endif @@ -403,7 +403,7 @@ NODE_PATH=%{buildroot}%{_prefix}/lib/node_modules %{buildroot}/%{_bindir}/node - %{_pkgdocdir}/npm/doc %changelog -* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-3 +* Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-4 - Fix incorrect Conflicts for nodejs-docs * Tue Nov 08 2016 Stephen Gallagher - 1:6.9.1-2 From e7cfbb014beb388e696adb0ee8dd6710ac90570a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 8 Nov 2016 17:05:57 -0500 Subject: [PATCH 4/4] Fix incorrect Conflicts for nodejs-docs --- nodejs.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index f0c2031..7e0936e 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -144,7 +144,7 @@ Conflicts: node <= 0.3.2-12 # we don't need the seperate nodejs-punycode package, so we Provide it here so # dependent packages don't need to override the dependency generator. # See also: RHBZ#11511811 -# UPDATE: punycode will be deprecated and so we should unbundle it in Node v8 +# UPDATE: punycode will be deprecated and so we should unbundle it in Node v8 # and use upstream module instead # https://github.com/nodejs/node/commit/29e49fc286080215031a81effbd59eac092fff2f Provides: nodejs-punycode = %{punycode_version} @@ -186,7 +186,7 @@ real-time applications that run across distributed devices. %package devel Summary: JavaScript runtime - development headers Group: Development/Languages -Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} Requires: libuv-devel%{?_isa} Requires: openssl-devel%{?_isa} Requires: zlib-devel%{?_isa} @@ -224,8 +224,8 @@ BuildArch: noarch # We don't require that the main package be installed to # use the docs, but if it is installed, make sure the # version always matches -Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release} -Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release} +Conflicts: %{name} > %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} +Conflicts: %{name} < %{epoch}:%{nodejs_version}-%{nodejs_release}%{?dist} %description docs The API documentation for the Node.js JavaScript runtime.