packages: nodejs/nodejs.spec - 0.1.100 - use system waf

[aredridel]

Author: aredridel                    Date: Sat Jul  3 23:55:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.1.100
- use system waf

---- Files affected:
packages/nodejs:
   nodejs.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/nodejs/nodejs.spec
diff -u packages/nodejs/nodejs.spec:1.8 packages/nodejs/nodejs.spec:1.9
--- packages/nodejs/nodejs.spec:1.8	Sat Jun 12 03:17:45 2010
+++ packages/nodejs/nodejs.spec	Sun Jul  4 01:55:34 2010
@@ -1,16 +1,14 @@
 # $Revision$, $Date$
-# TODO:
-# - use system waf
 
 Summary:	Asynchronous JavaScript Engine
 Name:		nodejs
-Version:	0.1.98
+Version:	0.1.100
 Release:	0
 License:	BSD
 Group:		Libraries
 URL:		http://nodejs.org/
 Source0:	http://nodejs.org/dist/node-v%{version}.tar.gz
-# Source0-md5:	d8a75cb5c18ce20e0206ced95a8c1544
+# Source0-md5:	f8567739b71d05b8edcae1916d7e80cb
 BuildRequires:	gcc >= 5:4.0
 BuildRequires:	libeio-devel
 BuildRequires:	libev-devel >= 3.90
@@ -19,7 +17,8 @@
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	udns-devel
 BuildRequires:	c-ares-devel >= 1.7.1-0.20100523.0
-BuildRequires:	v8-devel >= 2.2.12
+BuildRequires:	v8-devel >= 2.2.21
+BuildRequires:	waf
 ExclusiveArch:	%{ix86} %{x8664} arm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,6 +35,7 @@
 %package devel
 Summary:	Development headers for nodejs
 Group:		Development/Libraries
+Requires:	waf
 
 %description devel
 Development headers for nodejs.
@@ -55,24 +55,32 @@
 CC=%{__cc}
 CXX=%{__cxx}
 %endif
-export CFLAGS LDFLAGS CXXFLAGS CC CXX
+PYTHONPATH=tools
+export CFLAGS LDFLAGS CXXFLAGS CC CXX PYTHONPATH
 
-tools/waf-light configure \
+waf configure \
 	--shared-v8 \
 	--shared-cares \
 	--shared-libev \
 	--prefix=%{_prefix}
 
-tools/waf-light build
+waf build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}/node/libraries}
-tools/waf-light install \
+
+PYTHONPATH=tools
+export PYTHONPATH
+
+waf install \
 	--destdir=$RPM_BUILD_ROOT
 
 cp -a lib/*.js $RPM_BUILD_ROOT%{_libdir}/node/libraries
 
+rm $RPM_BUILD_ROOT%{_bindir}/node-waf
+ln -s %{_bindir}/waf $RPM_BUILD_ROOT%{_bindir}/node-waf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,6 +107,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/07/03 23:55:34  aredridel
+- 0.1.100
+- use system waf
+
 Revision 1.8  2010/06/12 01:17:45  aredridel
 - 0.1.98
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs.spec?r1=1.8&r2=1.9&f=u