packages: nodejs/nodejs.spec - quote cc, ghost soname symlink

[glen]

Author: glen                         Date: Sun Sep 18 22:16:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- quote cc, ghost soname symlink

---- Files affected:
packages/nodejs:
   nodejs.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/nodejs/nodejs.spec
diff -u packages/nodejs/nodejs.spec:1.22 packages/nodejs/nodejs.spec:1.23
--- packages/nodejs/nodejs.spec:1.22	Mon Sep 19 00:09:03 2011
+++ packages/nodejs/nodejs.spec	Mon Sep 19 00:16:53 2011
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-
 Summary:	Asynchronous JavaScript Engine
 Name:		nodejs
 Version:	0.4.12
@@ -23,8 +22,6 @@
 ExclusiveArch:	%{ix86} %{x8664} arm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _plainlibdir %{_prefix}/lib
-
 %description
 Node's goal is to provide an easy way to build scalable network
 programs. In the above example, the two second delay does not prevent
@@ -54,36 +51,35 @@
 CXXFLAGS="%{rpmcxxflags}"
 LDFLAGS="%{rpmcflags}"
 %if "%{pld_release}" == "ac"
-CC=%{__cc}4
-CXX=%{__cxx}4
+CC="%{__cc}4"
+CXX="%{__cxx}4"
 %else
-CC=%{__cc}
-CXX=%{__cxx}
+CC="%{__cc}"
+CXX="%{__cxx}"
 %endif
 export CFLAGS LDFLAGS CXXFLAGS CC CXX
 
 export PYTHONPATH=tools
-python tools/waf-light configure \
+%{__python} tools/waf-light configure \
 	--shared-v8 \
 	--shared-cares \
 	--shared-libev \
 	--libdir=%{_libdir} \
 	--prefix=%{_prefix}
 
-python tools/waf-light build \
+%{__python} tools/waf-light build \
 	--product-type='cshlib'
 
 $CC -o build/default/node -Isrc src/node_main.cc -lnode -Lbuild/default
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 export PYTHONPATH=tools
-python tools/waf-light install \
+%{__python} tools/waf-light install \
 	--product-type=cshlib \
 	--destdir=$RPM_BUILD_ROOT
 
-install build/default/node $RPM_BUILD_ROOT%{_bindir}/node
+install -p build/default/node $RPM_BUILD_ROOT%{_bindir}/node
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,8 +91,9 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog LICENSE
 %attr(755,root,root) %{_bindir}/node
-%dir %{_libdir}/node
 %attr(755,root,root) %{_libdir}/libnode.so.*.*.*
+%ghost %{_libdir}/libnode.so.4
+%dir %{_libdir}/node
 %{_mandir}/man1/node.1*
 
 %files devel
@@ -108,7 +105,7 @@
 %dir %{_libdir}/node/wafadmin/Tools
 %{_libdir}/node/wafadmin/*.py
 %{_libdir}/node/wafadmin/Tools/*.py
-%{_libdir}/pkgconfig/nodejs.pc
+%{_pkgconfigdir}/nodejs.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -116,6 +113,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2011/09/18 22:16:53  glen
+- quote cc, ghost soname symlink
+
 Revision 1.22  2011/09/18 22:09:03  aredridel
 - 0.4.12
 - restore shared library
================================================================

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