- disable npm, packaged separately

[packages/nodejs.git] / nodejs.spec

diff --git a/nodejs.spec b/nodejs.spec
index 7bd39d66586a51ca0778be9271f25b08bd6d9f90..c1fab215444e0eea763961668a6b9aa8f7c95f4f 100644 (file)
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,12 +1,12 @@
 Summary:       Asynchronous JavaScript Engine
 Name:          nodejs
-Version:       0.6.6
-Release:       2
-License:       BSD
-Group:         Libraries
-URL:           http://nodejs.org/
-Source0:       http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz
-# Source0-md5: 43836ebd6e8e9059c4584e3b5ab50009
+Version:       0.6.8
+Release:       3
+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
 Patch1:                %{name}-soname.patch
 # force node to use /usr/lib/node as the systemwide module directory
 Patch2:                %{name}-libpath.patch
@@ -25,14 +25,11 @@ ExclusiveArch:      %{ix86} %{x8664} arm
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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
-the server from handling new requests. Node tells the operating system
-(through epoll, kqueue, /dev/poll, or select) that it should be
-notified when the 2 seconds are up or if a new connection is made --
-then it goes to sleep. If someone new connects, then it executes the
-callback, if the timeout expires, it executes the inner callback. Each
-connection is only a small heap allocation.
+Node.js is a platform built on Chrome's JavaScript runtime for easily
+building fast, scalable network applications. Node.js uses an
+event-driven, non-blocking I/O model that makes it lightweight and
+efficient, perfect for data-intensive real-time applications that run
+across distributed devices.
 
 %package devel
 Summary:       Development headers for nodejs
@@ -57,6 +54,9 @@ This package contains the documentation for nodejs.
 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
@@ -96,6 +96,7 @@ export PYTHONPATH=tools
        --shared-cares \
        --shared-v8 \
        --shared-zlib \
+       --without-npm \
        --libdir=%{_libdir} \
        --prefix=%{_prefix}
 
@@ -110,6 +111,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__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 \
@@ -122,7 +132,7 @@ chmod a+x $RPM_BUILD_ROOT%{_libdir}/*.so*
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 cat <<'EOF' > $RPM_BUILD_ROOT%{_pkgconfigdir}/%{name}.pc
 version=%{version}
-prefix=/usr
+prefix=%{_prefix}
 libdir=${prefix}/%{_lib}
 includedir=${prefix}/include/node
 
@@ -142,11 +152,6 @@ mv html/api/api/* html/api
 rm -rf html/api/api
 cd -
 
-# remove NPM; it's buggy in 0.6.3
-# but really we package npm from separate spec
-rm -rf $RPM_BUILD_ROOT%{_libdir}/node_modules
-rm $RPM_BUILD_ROOT%{_bindir}/npm
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -157,9 +162,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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.4
+%ghost %{_libdir}/libnode.so.6
 %dir %{_libdir}/node
+%dir %{_prefix}/lib/node
+%dir %{_prefix}/lib/node_modules
 %{_mandir}/man1/node.1*
 
 %files devel