X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=nodejs.spec;h=d61f710e88d72d1a07cc7cd8f8b9442ed4cf24af;hb=8c0b403f0c232cc81695fc709e054df737b6bdab;hp=90d23b8fbff3509f9c03f97cb42376134ee4b22f;hpb=c3b531ba12cd0862e1a5157845fc8d9a10057e95;p=packages%2Fnodejs.git

diff --git a/nodejs.spec b/nodejs.spec
index 90d23b8..d61f710 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,29 +1,63 @@
+# TODO
+# - unpackaged files
+#   /usr/share/doc/node/gdbinit
+
+# Conditional build:
+%bcond_without	system_uv	# system uv
+%bcond_with	shared		# build libnode.so shared library
+
+# NOTES:
+# - https://nodejs.org/en/download/releases/
+
+# NODE_MODULE_VERSION refers to the ABI (application binary interface) version
+# number of Node.js, used to determine which versions of Node.js compiled C++
+# 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	48
 Summary:	Asynchronous JavaScript Engine
+Summary(pl.UTF-8):	Asynchroniczny silnik JavaScriptu
 Name:		nodejs
-Version:	0.6.8
+# 6.9 is LTS, Active LTS: 2018-04-18, EOL: 2019-04-18
+# https://github.com/nodejs/LTS
+Version:	6.9.4
 Release:	1
-License:	BSD
-Group:		Libraries
-URL:		http://www.nodejs.org/
-Source0:	http://www.nodejs.org/dist/node-v%{version}.tar.gz
-# Source0-md5:	9fd7baa2d27b848c3134e6ae35bb87b2
-Patch1:		%{name}-soname.patch
+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:	3795199b5950b25179248847b1a5fc86
+Patch1:		%{name}-shared.patch
 # 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
-BuildRequires:	c-ares-devel >= 1.7.4
-BuildRequires:	gcc >= 5:4.0
-BuildRequires:	libeio-devel
-BuildRequires:	libev-devel >= 4.0.0
-BuildRequires:	libstdc++-devel
-BuildRequires:	python >= 1:2.5.2
+Patch4:		%{name}-use-system-certs.patch
+Patch5:		uv-fpic.patch
+URL:		https://nodejs.org/
+BuildRequires:	gcc >= 6:4.8
+BuildRequires:	http-parser-devel >= 2.7.0
+BuildRequires:	libstdc++-devel >= 6:4.8
+%{?with_system_uv:BuildRequires:	libuv-devel >= 1.6.0}
+BuildRequires:	openssl-devel >= 1.0.1
+BuildRequires:	pkgconfig
+BuildRequires:	python >= 1:2.7
 BuildRequires:	python-jsmin
+BuildRequires:	python-modules >= 1:2.7
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	v8-devel >= 3.6
+BuildRequires:	rpmbuild(macros) >= 1.219
+BuildRequires:	sed >= 4.0
+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)
 
+%define		sover	%(echo %{version} | cut -d. -f2)
+# add macro, so adapter won't replace it back literal
+%define		doc_ver	%{version}
+
 %description
 Node.js is a platform built on Chrome's JavaScript runtime for easily
 building fast, scalable network applications. Node.js uses an
@@ -31,91 +65,146 @@ event-driven, non-blocking I/O model that makes it lightweight and
 efficient, perfect for data-intensive real-time applications that run
 across distributed devices.
 
+%description -l pl.UTF-8
+Node.js to platforma zbudowana w opacriu o silnik JavaScriptu
+przeglądarki Chrome, służąca do tworzenia szybkich, skalowalnych
+aplikacji sieciowych. Node.js wykorzystuje nieblokujący model
+wejścia/wyjścia sterowany zdarzeniami, dzięki czemu jest lekki i
+wydajny, dobrze nadający się do aplikacji przetwarzających duże
+ilości danych w czasie rzeczywistym, uruchamianych na rozproszonych
+urządzeniach.
+
 %package devel
 Summary:	Development headers for nodejs
+Summary(pl.UTF-8):	Pliki nagłówkowe nodejs
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	gcc
+Requires:	http-parser-devel >= 2.5.0
+Requires:	libstdc++-devel
+%{?with_system_uv:Requires:	libuv-devel >= 1.6.0}
+Requires:	openssl-devel
+Requires:	zlib-devel
 
 %description devel
 Development headers for nodejs.
 
+%description devel -l pl.UTF-8
+Pliki nagłówkowe nodejs.
+
 %package doc
-Summary:	Evented I/O for V8 JavaScript - documentation
+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"
+BuildArch:	noarch
+%endif
 
 %description doc
 Node.js is a server-side JavaScript environment that uses an
 asynchronous event-driven model. Node's goal is to provide an easy way
 to build scalable network programs.
 
-This package contains the documentation for nodejs.
+This package contains the documentation for Node.js.
 
-%package waf
-Summary:	Evented I/O for V8 JavaScript - customized WAF build system
-Group:		Libraries
+%description doc -l pl.UTF-8
+Node.js to serwerowe środowisko JavaScriptu wykorzystujące
+asynchroniczny model sterowany zdarzeniami. Celem Node jest
+zapewnienie łatwego sposobu tworzenia skalowalnych programów
+sieciowych.
+
+Ten pakiet zawiera dokumentację Node.js.
+
+%package -n systemtap-nodejs
+Summary:	systemtap/dtrace probes for Node.js
+Summary(pl.UTF-8):	Sondy systemtap/dtrace dla Node.js
+Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
+Requires:	systemtap-client
 
-%description waf
-Node.js is a server-side JavaScript environment that uses an
-asynchronous event-driven model. Node's goal is to provide an easy way
-to build scalable network programs.
+%description -n systemtap-nodejs
+systemtap/dtrace probes for Node.js.
 
-This package contains the customized version of the WAF build system
-used by Node.js and many of its modules.
+%description -n systemtap-nodejs -l pl.UTF-8
+Sondy systemtap/dtrace dla Node.js.
 
 %prep
 %setup -q -n node-v%{version}
-%patch1 -p1
+%{?with_shared:%patch1 -p1}
+#%patch1 -p1
 %if %{_lib} == "lib64"
 %patch3 -p1
 %else
 %patch2 -p1
 %endif
+%patch4 -p1
+%{__rm} src/node_root_certs.h
+#%{?with_system_uv:%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
+%{__rm} -r deps/openssl
+%{?with_system_uv:%{__rm} -r deps/uv}
+%{__rm} -r deps/zlib
 
 %build
-%undefine	with_ccache
-# build library
-CFLAGS="%{rpmcflags} -fPIC"
-CXXFLAGS="%{rpmcxxflags} -fPIC"
-LDFLAGS="%{rpmcflags}"
-%if "%{pld_release}" == "ac"
-CC="%{__cc}4"
-CXX="%{__cxx}4"
-%else
-CC="%{__cc}"
-CXX="%{__cxx}"
-%endif
-export CFLAGS LDFLAGS CXXFLAGS CC CXX
+ver=$(awk '/#define NODE_MODULE_VERSION/{print $3}' src/node_version.h)
+test "$ver" = "%{node_module_version}"
 
-# NOT autoconf so dont use macro
-export PYTHONPATH=tools
+# CC used only to detect if CC is clang, not used for compiling
+CC="%{__cc}" \
+CXX="%{__cxx}" \
+GYP_DEFINES="soname_version=%{sover}" \
 ./configure \
-	--shared-cares \
-	--shared-v8 \
+	%{?0:--shared-cares} \
+	--shared-openssl \
+	--shared-http-parser \
+	%{?with_system_uv:--shared-libuv} \
 	--shared-zlib \
-	--libdir=%{_libdir} \
+	--without-npm \
+	--without-dtrace \
 	--prefix=%{_prefix}
 
-%{__make} dynamiclib
-%{__make} program
-
-# relink with shared lib
-$CC -o out/Release/node src/node_main.cc -Isrc -Ideps/uv/include -lnode -Lout/Release
+# add LFS defines from libuv (RHBZ#892601)
+# CXXFLAGS must be exported, as it is needed for make, not gyp
+CXXFLAGS="%{rpmcxxflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC" \
+LDFLAGS="%{rpmldflags}" \
+%{__make} -C out \
+	BUILDTYPE=Release \
+	V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$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
+
+echo '.so man1/node.1' > $RPM_BUILD_ROOT%{_mandir}/man1/nodejs.1
+
+install -d $RPM_BUILD_ROOT%{_includedir}/node
+cp -p src/*.h $RPM_BUILD_ROOT%{_includedir}/node
+
+# install for node-gyp
+install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name}
+cp -p common.gypi $RPM_BUILD_ROOT%{_usrsrc}/%{name}
+ln -s %{_includedir}/node $RPM_BUILD_ROOT%{_usrsrc}/%{name}/src
+
+# for compat of fedora derivered scripts (shebangs)
 ln -s node $RPM_BUILD_ROOT%{_bindir}/nodejs
 
-# install shared lib
-export PYTHONPATH=tools
-%{__python} tools/waf-light install \
-	--product-type=cshlib \
-	--destdir=$RPM_BUILD_ROOT
+# globally installed node modules (noarch)
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/node_modules
 
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so*
+# default searchpaths
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_prefix}/lib}/node
 
 # create pkgconfig
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -132,50 +221,49 @@ Cflags: -I${includedir}
 EOF
 
 # install documentation
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/html
-cp -a doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/html
-cd $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
-install -d api
-mv html/api/*.markdown api
-mv html/api/api/* html/api
-rm -rf html/api/api
-cd -
-
-# remove NPM; it's buggy in 0.6.3
-# but really we package npm from separate spec
-rm -rf $RPM_BUILD_ROOT%{_libdir}/node_modules
-rm $RPM_BUILD_ROOT%{_bindir}/npm
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+cp -a doc/api/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/*.md
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/*.json
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%if %{with shared}
+%post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(644,root,root,755)
-%doc README.md AUTHORS ChangeLog LICENSE
+%doc README.md AUTHORS CHANGELOG.md ROADMAP.md LICENSE
 %attr(755,root,root) %{_bindir}/node
 %attr(755,root,root) %{_bindir}/nodejs
+%if %{with shared}
 %attr(755,root,root) %{_libdir}/libnode.so.*.*.*
-%ghost %{_libdir}/libnode.so.4
+%attr(755,root,root) %ghost %{_libdir}/libnode.so.10
+%endif
+%if "%{_lib}" != "lib"
 %dir %{_libdir}/node
+%endif
+%dir %{_prefix}/lib/node
+%dir %{_prefix}/lib/node_modules
 %{_mandir}/man1/node.1*
+%{_mandir}/man1/nodejs.1*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libnode.so
+%if %{with shared}
+%attr(755,root,root) %{_libdir}/libnode.so
+%endif
 %{_includedir}/node
 %{_pkgconfigdir}/nodejs.pc
+%{_usrsrc}/%{name}
 
 %files doc
 %defattr(644,root,root,755)
 %doc %{_docdir}/%{name}-doc-%{version}
 
-%files waf
+%files -n systemtap-nodejs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/node-waf
-%dir %{_libdir}/node/wafadmin
-%dir %{_libdir}/node/wafadmin/Tools
-%{_libdir}/node/wafadmin/*.py
-%{_libdir}/node/wafadmin/Tools/*.py
+%{_datadir}/systemtap/tapset/node.stp