packages: nodejs/nodejs.spec - waf fixes (blind as deps not present in th)

[glen]

Author: glen                         Date: Mon Jul 12 16:07:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- waf fixes (blind as deps not present in th)

---- Files affected:
packages/nodejs:
   nodejs.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/nodejs/nodejs.spec
diff -u packages/nodejs/nodejs.spec:1.10 packages/nodejs/nodejs.spec:1.11
--- packages/nodejs/nodejs.spec:1.10	Sun Jul  4 03:44:34 2010
+++ packages/nodejs/nodejs.spec	Mon Jul 12 18:07:08 2010
@@ -55,33 +55,31 @@
 CC=%{__cc}
 CXX=%{__cxx}
 %endif
-PYTHONPATH=tools
-export CFLAGS LDFLAGS CXXFLAGS CC CXX PYTHONPATH
+export CFLAGS LDFLAGS CXXFLAGS CC CXX
 
-waf configure \
+export PYTHONPATH=tools
+%waf configure \
 	--shared-v8 \
 	--shared-cares \
 	--shared-libev \
 	--prefix=%{_prefix}
 
-waf build
+%waf build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}/node/libraries,%{_libdir}/waf/wafadmin/Tools}
 
-PYTHONPATH=tools
-export PYTHONPATH
-
-waf install \
+export PYTHONPATH=tools
+%waf install \
 	--destdir=$RPM_BUILD_ROOT
 
 cp -a lib/*.js $RPM_BUILD_ROOT%{_libdir}/node/libraries
-
-cp tools/wafadmin/Tools/node_addon.py $RPM_BUILD_ROOT%{_libdir}/waf/wafadmin/Tools/
+cp tools/wafadmin/Tools/node_addon.py $RPM_BUILD_ROOT%{_libdir}/waf/wafadmin/Tools
 
 rm $RPM_BUILD_ROOT%{_bindir}/node-waf
-ln -s %{_bindir}/waf $RPM_BUILD_ROOT%{_bindir}/node-waf
+# ? really required?
+ln -s waf $RPM_BUILD_ROOT%{_bindir}/node-waf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,18 +96,19 @@
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/node
-%{_includedir}/node/*.h
+%{_includedir}/node
 %attr(755,root,root) %{_bindir}/node-waf
 %{_libdir}/waf/wafadmin/Tools/node_addon.py
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/07/12 16:07:08  glen
+- waf fixes (blind as deps not present in th)
+
 Revision 1.10  2010/07/04 01:44:34  aredridel
 - package node_addon waf script
 
================================================================

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