Author: glen Date: Mon Dec 19 12:01:07 2011 GMT Module: packages Tag: HEAD ---- Log message:
- up to 0.6.6 ---- Files affected: packages/nodejs: nodejs.spec (1.24 -> 1.25) , nodejs-lib64path.patch (NONE -> 1.1) (NEW), nodejs-libpath.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/nodejs/nodejs.spec diff -u packages/nodejs/nodejs.spec:1.24 packages/nodejs/nodejs.spec:1.25 --- packages/nodejs/nodejs.spec:1.24 Wed Nov 16 11:43:12 2011 +++ packages/nodejs/nodejs.spec Mon Dec 19 13:01:02 2011 @@ -1,24 +1,27 @@ # $Revision$, $Date$ Summary: Asynchronous JavaScript Engine Name: nodejs -Version: 0.4.12 -Release: 2 +Version: 0.6.6 +Release: 1 License: BSD Group: Libraries URL: http://nodejs.org/ -Source0: http://nodejs.org/dist/node-v%{version}.tar.gz -# Source0-md5: a6375eaa43db5356bf443e25b828ae16 -Patch0: %{name}-ev-multiplicity.patch +Source0: http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz +# Source0-md5: 43836ebd6e8e9059c4584e3b5ab50009 Patch1: %{name}-soname.patch -BuildRequires: c-ares-devel +# 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 +BuildRequires: python >= 1:2.5.2 +BuildRequires: python-jsmin BuildRequires: rpm >= 4.4.9-56 -BuildRequires: v8-devel >= 3.1.5 +BuildRequires: v8-devel >= 3.6 ExclusiveArch: %{ix86} %{x8664} arm BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,15 +43,44 @@ %description devel Development headers for nodejs. +%package doc +Summary: Evented I/O for V8 JavaScript - documentation +Group: Documentation + +%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. + +%package waf +Summary: Evented I/O for V8 JavaScript - customized WAF build system +Group: Libraries +Requires: %{name} = %{version}-%{release} + +%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. + +This package contains the customized version of the WAF build system +used by Node.js and many of its modules. + %prep %setup -q -n node-v%{version} -%patch0 -p1 %patch1 -p1 +%if %{_lib} == "lib64" +%patch3 -p1 +%else +%patch2 -p1 +%endif %build +%undefine with_ccache # build library -CFLAGS="%{rpmcflags}" -CXXFLAGS="%{rpmcxxflags}" +CFLAGS="%{rpmcflags} -fPIC" +CXXFLAGS="%{rpmcxxflags} -fPIC" LDFLAGS="%{rpmcflags}" %if "%{pld_release}" == "ac" CC="%{__cc}4" @@ -59,29 +91,60 @@ %endif export CFLAGS LDFLAGS CXXFLAGS CC CXX +# NOT autoconf so dont use macro export PYTHONPATH=tools -%{__python} tools/waf-light configure \ - --shared-v8 \ +./configure \ --shared-cares \ - --shared-libev \ + --shared-v8 \ + --shared-zlib \ --libdir=%{_libdir} \ --prefix=%{_prefix} -%{__python} tools/waf-light build \ - --product-type='cshlib' +%{__make} dynamiclib +%{__make} program -$CC -o build/default/node -Isrc src/node_main.cc -lnode -Lbuild/default +# relink with shared lib +$CC -o out/Release/node src/node_main.cc -Isrc -Ideps/uv/include -lnode -Lout/Release %install rm -rf $RPM_BUILD_ROOT +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +# install shared lib export PYTHONPATH=tools %{__python} tools/waf-light install \ --product-type=cshlib \ --destdir=$RPM_BUILD_ROOT -install -p build/default/node $RPM_BUILD_ROOT%{_bindir}/node - -chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so* +# create pkgconfig +install -d $RPM_BUILD_ROOT%{_pkgconfigdir} +cat <<'EOF' > $RPM_BUILD_ROOT%{_pkgconfigdir}/%{name}.pc +version=%{version} +prefix=/usr +libdir=${prefix}/lib +includedir=${prefix}/include/node + +Name: nodejs +Description: Evented I/O for V8 JavaScript. +Version: ${version} +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 %clean rm -rf $RPM_BUILD_ROOT @@ -91,7 +154,7 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog LICENSE +%doc README.md AUTHORS ChangeLog LICENSE %attr(755,root,root) %{_bindir}/node %attr(755,root,root) %{_libdir}/libnode.so.*.*.* %ghost %{_libdir}/libnode.so.4 @@ -102,12 +165,19 @@ %defattr(644,root,root,755) %{_libdir}/libnode.so %{_includedir}/node +%{_pkgconfigdir}/nodejs.pc + +%files doc +%defattr(644,root,root,755) +%doc %{_docdir}/%{name}-doc-%{version} + +%files waf +%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 -%{_pkgconfigdir}/nodejs.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -115,6 +185,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2011/12/19 12:01:02 glen + +- up to 0.6.6 + Revision 1.24 2011/11/16 10:43:12 glen - fix waf not installing libs with executable bits and rpmbuild not generating autodeps ================================================================ Index: packages/nodejs/nodejs-lib64path.patch diff -u /dev/null packages/nodejs/nodejs-lib64path.patch:1.1 --- /dev/null Mon Dec 19 13:01:07 2011 +++ packages/nodejs/nodejs-lib64path.patch Mon Dec 19 13:01:02 2011 @@ -0,0 +1,11 @@ +--- ../node-v0.4.11.original/lib/module.js 2011-08-17 18:18:10.000000000 -0700 ++++ ./lib/module.js 2011-08-22 14:37:06.590597180 -0700 +@@ -422,7 +422,7 @@ + }; + + Module._initPaths = function() { +- var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')]; ++ var paths = ["/usr/lib/node", "/usr/lib64/node"]; + + if (process.env['HOME']) { + paths.unshift(path.resolve(process.env['HOME'], '.node_libraries')); ================================================================ Index: packages/nodejs/nodejs-libpath.patch diff -u /dev/null packages/nodejs/nodejs-libpath.patch:1.1 --- /dev/null Mon Dec 19 13:01:07 2011 +++ packages/nodejs/nodejs-libpath.patch Mon Dec 19 13:01:02 2011 @@ -0,0 +1,11 @@ +--- ../node-v0.4.11.original/lib/module.js 2011-08-17 18:18:10.000000000 -0700 ++++ ./lib/module.js 2011-08-22 14:36:11.662283878 -0700 +@@ -422,7 +422,7 @@ + }; + + Module._initPaths = function() { +- var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')]; ++ var paths = ["/usr/lib/node"]; + + if (process.env['HOME']) { + paths.unshift(path.resolve(process.env['HOME'], '.node_libraries')); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs.spec?r1=1.24&r2=1.25&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
