X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nodejs.spec;h=6ce43ed63836aaa2b2f3a3b7fedf9b74f3da568f;hb=5f8e20f9799592dd220eb5e5de68ec1093c8b0a3;hp=a51c44fe54d4eb225e17f4abef05b4cea9000555;hpb=3720ca3dffaf0da9a5e2c70c1e95e1ae4e336978;p=packages%2Fnodejs.git

diff --git a/nodejs.spec b/nodejs.spec
index a51c44f..6ce43ed 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -4,7 +4,7 @@
 
 # Conditional build:
 %bcond_without	system_uv	# system uv
-%bcond_with	shared		# build libnode.so shared library
+%bcond_with	http_parser	# use system http-parser and llhttp
 
 # NOTES:
 # - https://nodejs.org/en/download/releases/
@@ -14,31 +14,38 @@
 # add-on binaries can be loaded in to without needing to be re-compiled. It
 # used to be stored as hex value in earlier versions, but is now represented as
 # an integer.
-%define		node_module_version	57
+%define		node_module_version	72
 Summary:	Asynchronous JavaScript Engine
 Summary(pl.UTF-8):	Asynchroniczny silnik JavaScriptu
 Name:		nodejs
-# 6.x LTS - https://github.com/nodejs/LTS:
-# Active start: 2016-10-18
-# Maintenance start: April 2018
-# Maintenance end: April 2019
-Version:	8.9.3
-Release:	1
+# 12.x LTS - https://github.com/nodejs/Release
+# Active start: 2019-10-21
+# Maintenance start: October 2020
+# Maintenance end: April 2022
+Version:	12.16.1
+Release:	2
 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
-# Source0-md5:	88c12ccd5806a101b00139140d958c2b
-Patch1:		%{name}-shared.patch
+# Source0-md5:	99f580f6066c53b7bf4b5f02b81dac29
+
 # force node to use /usr/lib/node as the systemwide module directory
 Patch2:		%{name}-libpath.patch
 # use /usr/lib64/node as an arch-specific module dir when appropriate
 Patch3:		%{name}-lib64path.patch
-Patch5:		uv-fpic.patch
+Patch4:		0001-Disable-running-gyp-on-shared-deps.patch
+Patch5:		0002-Install-both-binaries-and-use-libdir.patch
 URL:		https://nodejs.org/
+BuildRequires:	c-ares-devel >= 1.14.0
 BuildRequires:	gcc >= 6:4.8
-BuildRequires:	http-parser-devel >= 2.7.0
+%if %{with http_parser}
+BuildRequires:	http-parser-devel >= 2.9.3
+BuildRequires:	llhttp-devel >= 2.0.1
+%endif
+BuildRequires:	libicu-devel >= 0.64
 BuildRequires:	libstdc++-devel >= 6:4.8
-%{?with_system_uv:BuildRequires:	libuv-devel >= 1.18.0}
+%{?with_system_uv:BuildRequires:	libuv-devel >= 1.34.0}
+BuildRequires:	nghttp2-devel >= 1.40.0
 BuildRequires:	openssl-devel >= 1.0.1
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.7
@@ -48,11 +55,14 @@ BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
+%{?with_http_parser:Requires:	http-parser >= 2.9.3}
+%{?with_system_uv:Requires:	libuv >= 1.34.0}
+Requires:	nghttp2-libs >= 1.40.0
 Requires:	ca-certificates
 Provides:	nodejs(engine) = %{version}
 Provides:	nodejs(module-version) = %{node_module_version}
 Obsoletes:	nodejs-waf
-ExclusiveArch:	%{ix86} %{x8664} arm
+ExclusiveArch:	%{ix86} %{x8664} %{arm} aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		sover	%(echo %{version} | cut -d. -f2)
@@ -81,9 +91,9 @@ Summary(pl.UTF-8):	Pliki nagłówkowe nodejs
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gcc
-Requires:	http-parser-devel >= 2.5.0
+%{?with_http_parser:Requires:	http-parser-devel >= 2.9.3}
 Requires:	libstdc++-devel
-%{?with_system_uv:Requires:	libuv-devel >= 1.6.0}
+%{?with_system_uv:Requires:	libuv-devel >= 1.34.0}
 Requires:	openssl-devel
 Requires:	zlib-devel
 
@@ -98,7 +108,7 @@ Summary:	Documentation for Node.js engine
 Summary(pl.UTF-8):	Dokumentacja silnika Node.js
 Group:		Documentation
 URL:		https://nodejs.org/dist/v%{doc_ver}/docs/api
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -132,19 +142,19 @@ Sondy systemtap/dtrace dla Node.js.
 
 %prep
 %setup -q -n node-v%{version}
-%{?with_shared:%patch1 -p1}
 #%patch1 -p1
 %if %{_lib} == "lib64"
 %patch3 -p1
 %else
 %patch2 -p1
 %endif
-#%{?with_system_uv:%patch5 -p1}
+%patch4 -p1
+%patch5 -p1
 
 grep -r '#!.*env python' -l . | xargs %{__sed} -i -e '1 s,#!.*env python,#!%{__python},'
 
 %{__rm} -r deps/npm
-%{__rm} -r deps/http_parser
+%{?with_http_parser:%{__rm} -r deps/http_parser}
 %{__rm} -r deps/openssl
 %{?with_system_uv:%{__rm} -r deps/uv}
 %{__rm} -r deps/zlib
@@ -158,15 +168,19 @@ CC="%{__cc}" \
 CXX="%{__cxx}" \
 GYP_DEFINES="soname_version=%{sover}" \
 ./configure \
+	--prefix=%{_prefix} \
+	--libdir=%{_lib} \
 	--openssl-use-def-ca-store \
-	%{?0:--shared-cares} \
-	--shared-openssl \
-	--shared-http-parser \
+	--shared \
+	--shared-cares \
+	%{?with_http_parser:--shared-http-parser} \
 	%{?with_system_uv:--shared-libuv} \
+	--shared-nghttp2 \
+	--shared-openssl \
 	--shared-zlib \
-	--without-npm \
+	--with-intl=system-icu \
 	--without-dtrace \
-	--prefix=%{_prefix}
+	--without-npm
 
 # add LFS defines from libuv (RHBZ#892601)
 # CXXFLAGS must be exported, as it is needed for make, not gyp
@@ -181,11 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__python} tools/install.py install "$RPM_BUILD_ROOT" "%{_prefix}"
 
-%if %{with shared}
-lib=$(basename $RPM_BUILD_ROOT%{_libdir}/libnode.so.*.*.*)
-ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libnode.so.10
-ln -s $lib $RPM_BUILD_ROOT%{_libdir}/libnode.so
-%endif
+ln -s libnode.so.%{node_module_version} $RPM_BUILD_ROOT%{_libdir}/libnode.so
 
 echo '.so man1/node.1' > $RPM_BUILD_ROOT%{_mandir}/man1/nodejs.1
 
@@ -229,20 +239,15 @@ cp -a doc/api/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with shared}
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-%endif
 
 %files
 %defattr(644,root,root,755)
-%doc README.md AUTHORS CHANGELOG.md LICENSE
+%doc AUTHORS CHANGELOG.md LICENSE README.md SECURITY.md
 %attr(755,root,root) %{_bindir}/node
 %attr(755,root,root) %{_bindir}/nodejs
-%if %{with shared}
-%attr(755,root,root) %{_libdir}/libnode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnode.so.10
-%endif
+%attr(755,root,root) %{_libdir}/libnode.so.%{node_module_version}
 %if "%{_lib}" != "lib"
 %dir %{_libdir}/node
 %endif
@@ -253,9 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%if %{with shared}
 %attr(755,root,root) %{_libdir}/libnode.so
-%endif
 %{_includedir}/node
 %{_pkgconfigdir}/nodejs.pc
 %{_usrsrc}/%{name}