- reverted to glen's version

diff --git a/nodejs.spec b/nodejs.spec
index 94948142fbcae79a0f5cac66f7b5bbc91af7f73e..745fbc9fd1ad743d908a8470fac9e9010dfc2fac 100644 (file)
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,13 +1,13 @@
 Summary:       Asynchronous JavaScript Engine
 Name:          nodejs
-Version:       0.8.14
+Version:       0.6.21
 Release:       1
 License:       BSD and MIT and ASL 2.0 and GPLv3
 Group:         Development/Languages
 URL:           http://www.nodejs.org/
 Source0:       http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz
-# Source0-md5: 284fd2c7578064c339d9cf6a3a475ac7
-#Patch1:               %{name}-soname.patch
+# Source0-md5: 0da985a0bf820400af92363b9f453fe4
+Patch1:                %{name}-soname.patch
 # 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
@@ -71,7 +71,7 @@ used by Node.js and many of its modules.
 
 %prep
 %setup -q -n node-v%{version}
-#%patch1 -p1
+%patch1 -p1
 %if %{_lib} == "lib64"
 %patch3 -p1
 %else
@@ -98,14 +98,23 @@ export CFLAGS LDFLAGS CXXFLAGS CC CXX LINKFLAGS_UV
 
 # Error: V8 doesn't like ccache. Please set your CC env var to 'gcc'
 CC=${CC#ccache }
+
+# NOT autoconf so dont use macro
+export PYTHONPATH=tools
 ./configure \
+       --shared-cares \
        --shared-v8 \
        --shared-zlib \
        --without-npm \
+       --libdir=%{_libdir} \
        --prefix=%{_prefix}
 
 # build library
-%{__make}
+%{__make} dynamiclib
+%{__make} program
+
+# 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
@@ -125,9 +134,11 @@ install -d $RPM_BUILD_ROOT{%{_libdir},%{_prefix}/lib}/node
 
 # install shared lib
 export PYTHONPATH=tools
-%{__python} tools/install.py install  $RPM_BUILD_ROOT
+%{__python} tools/waf-light install \
+       --product-type=cshlib \
+       --destdir=$RPM_BUILD_ROOT
 
-#chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so*
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so*
 
 # create pkgconfig
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
@@ -165,13 +176,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md AUTHORS ChangeLog LICENSE
 %attr(755,root,root) %{_bindir}/node
 %attr(755,root,root) %{_bindir}/nodejs
+%attr(755,root,root) %{_libdir}/libnode.so.*.*.*
+%ghost %{_libdir}/libnode.so.6
+%if "%{_lib}" != "lib"
 %dir %{_libdir}/node
+%endif
+%dir %{_prefix}/lib/node
 %dir %{_prefix}/lib/node_modules
 %{_mandir}/man1/node.1*
 %{_mandir}/man1/nodejs.1
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libnode.so
 %{_includedir}/node
 %{_pkgconfigdir}/nodejs.pc