packages: nodejs/nodejs-lib64path.patch, nodejs/nodejs-libpath.patch, nodej...

glen glen at pld-linux.org
Thu Jan 26 16:12:04 CET 2012


Author: glen                         Date: Thu Jan 26 15:12:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add node_modules to library search paths
- gcc and g++ deps for waf package
- new soname

---- Files affected:
packages/nodejs:
   nodejs-lib64path.patch (1.2 -> 1.3) , nodejs-libpath.patch (1.1 -> 1.2) , nodejs.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/nodejs/nodejs-lib64path.patch
diff -u packages/nodejs/nodejs-lib64path.patch:1.2 packages/nodejs/nodejs-lib64path.patch:1.3
--- packages/nodejs/nodejs-lib64path.patch:1.2	Thu Jan 26 15:54:43 2012
+++ packages/nodejs/nodejs-lib64path.patch	Thu Jan 26 16:11:58 2012
@@ -5,7 +5,7 @@
  
  Module._initPaths = function() {
 -  var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')];
-+  var paths = ["/usr/lib64/node", "/usr/lib/node"];
++  var paths = ["/usr/lib64/node", "/usr/lib/node", "/usr/lib/node_modules"];
  
    if (process.env['HOME']) {
      paths.unshift(path.resolve(process.env['HOME'], '.node_libraries'));

================================================================
Index: packages/nodejs/nodejs-libpath.patch
diff -u packages/nodejs/nodejs-libpath.patch:1.1 packages/nodejs/nodejs-libpath.patch:1.2
--- packages/nodejs/nodejs-libpath.patch:1.1	Mon Dec 19 13:01:02 2011
+++ packages/nodejs/nodejs-libpath.patch	Thu Jan 26 16:11:58 2012
@@ -5,7 +5,7 @@
  
  Module._initPaths = function() {
 -  var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')];
-+  var paths = ["/usr/lib/node"];
++  var paths = ["/usr/lib/node", "/usr/lib/node_modules"];
  
    if (process.env['HOME']) {
      paths.unshift(path.resolve(process.env['HOME'], '.node_libraries'));

================================================================
Index: packages/nodejs/nodejs.spec
diff -u packages/nodejs/nodejs.spec:1.27 packages/nodejs/nodejs.spec:1.28
--- packages/nodejs/nodejs.spec:1.27	Wed Jan 25 23:58:13 2012
+++ packages/nodejs/nodejs.spec	Thu Jan 26 16:11:58 2012
@@ -2,9 +2,9 @@
 Summary:	Asynchronous JavaScript Engine
 Name:		nodejs
 Version:	0.6.8
-Release:	1
-License:	BSD
-Group:		Libraries
+Release:	2
+License:	BSD and MIT and ASL 2.0 and GPLv3
+Group:		Development/Languages
 URL:		http://www.nodejs.org/
 Source0:	http://www.nodejs.org/dist/node-v%{version}.tar.gz
 # Source0-md5:	9fd7baa2d27b848c3134e6ae35bb87b2
@@ -55,6 +55,9 @@
 Summary:	Evented I/O for V8 JavaScript - customized WAF build system
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-devel
+Requires:	gcc
+Requires:	libstdc++-devel
 
 %description waf
 Node.js is a server-side JavaScript environment that uses an
@@ -108,8 +111,15 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# for compat of fedora derivered scripts (shebangs)
 ln -s node $RPM_BUILD_ROOT%{_bindir}/nodejs
 
+# globally installed node modules (noarch)
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/node_modules
+
+# default searchpaths
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_prefix}/lib}/node
+
 # install shared lib
 export PYTHONPATH=tools
 %{__python} tools/waf-light install \
@@ -159,8 +169,10 @@
 %attr(755,root,root) %{_bindir}/node
 %attr(755,root,root) %{_bindir}/nodejs
 %attr(755,root,root) %{_libdir}/libnode.so.*.*.*
-%ghost %{_libdir}/libnode.so.4
+%ghost %{_libdir}/libnode.so.6
 %dir %{_libdir}/node
+%dir %{_prefix}/lib/node
+%dir %{_prefix}/lib/node_modules
 %{_mandir}/man1/node.1*
 
 %files devel
@@ -187,6 +199,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2012/01/26 15:11:58  glen
+- add node_modules to library search paths
+- gcc and g++ deps for waf package
+- new soname
+
 Revision 1.27  2012/01/25 22:58:13  glen
 - up to 0.6.8
 - update description from homepage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs-lib64path.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs-libpath.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs.spec?r1=1.27&r2=1.28&f=u



More information about the pld-cvs-commit mailing list