[packages/nodejs: 14/15] add 4.2.6 to th

[glen]

commit 145d5ed0c83652fc0e4f2435f44be261f5da565d
Merge: 6fd9aec 8a00575
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 30 19:53:49 2016 +0300

    add 4.2.6 to th
    
    Merge branch 'dev-4.2'
    
    Conflicts:
    	nodejs.spec

 nodejs-revert-utf8-node.patch | 689 ------------------------------------------
 nodejs-revert-utf8-v8.patch   |  91 ------
 nodejs-use-system-certs.patch |  39 ++-
 nodejs.spec                   |  61 ++--
 4 files changed, 44 insertions(+), 836 deletions(-)
---
diff --cc nodejs.spec
index a249b4b,5f676a1..83b44be
--- a/nodejs.spec
+++ b/nodejs.spec
@@@ -7,12 -10,11 +10,13 @@@
  # NOTES:
  # - https://nodejs.org/en/download/releases/
  
 +# see "Modules" column in https://nodejs.org/en/download/releases/
 +%define		node_module_version	11
  Summary:	Asynchronous JavaScript Engine
  Name:		nodejs
- Version:	0.10.41
- Release:	2
+ # 4.2.x is LTS
+ Version:	4.2.6
+ Release:	1
  License:	BSD and MIT and Apache v2.0 and GPL v3
  Group:		Development/Languages
  Source0:	https://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz
@@@ -43,11 -39,8 +41,10 @@@ BuildRequires:	python-module
  BuildRequires:	rpm >= 4.4.9-56
  BuildRequires:	rpmbuild(macros) >= 1.219
  BuildRequires:	sed >= 4.0
- %{?with_system_v8:BuildRequires:	v8-devel >= 3.15.11.18-2}
  BuildRequires:	zlib-devel
  Requires:	ca-certificates
 +Provides:	nodejs(engine) = %{version}
 +Provides:	nodejs(module-version) = %{node_module_version}
  Obsoletes:	nodejs-waf
  ExclusiveArch:	%{ix86} %{x8664} arm
  BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@@ -117,13 -107,6 +111,9 @@@ rm -r deps/openss
  rm -r deps/zlib
  
  %build
- ver=$(awk '/#define NODE_MODULE_VERSION/{print $NF}' src/node.h)
- if [ $ver != %{node_module_version} ]; then
- 	echo "Set %%define node_module_version to $ver and re-run."
- 	exit 1
- fi
++ver=$(awk '/#define NODE_MODULE_VERSION/{print $NF}' src/node_version.h)
++test "$ver" = "%{node_module_version}"
 +
  # CC used only to detect if CC is clang, not used for compiling
  CC="%{__cc}" \
  CXX="%{__cxx}" \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nodejs.git/commitdiff/c8ef655685d87e8ec501ee249a3bb1722720116b