packages: npm/npm.spec - add doc/cli files for "help" command; cleanups; so...

[glen]

Author: glen                         Date: Wed Jan 25 22:45:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add doc/cli files for "help" command; cleanups; some deps optional

---- Files affected:
packages/npm:
   npm.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/npm/npm.spec
diff -u packages/npm/npm.spec:1.2 packages/npm/npm.spec:1.3
--- packages/npm/npm.spec:1.2	Tue Jan 24 22:18:10 2012
+++ packages/npm/npm.spec	Wed Jan 25 23:45:28 2012
@@ -5,7 +5,7 @@
 Summary:	A package manager for node.js
 Name:		npm
 Version:	1.0.106
-Release:	0.6
+Release:	0.8
 License:	MIT License
 Group:		Development/Libraries
 URL:		http://npmjs.org/
@@ -15,7 +15,6 @@
 Requires:	nodejs
 Requires:	nodejs-abbrev >= 1.0.3
 Requires:	nodejs-block-stream
-Requires:	nodejs-devel
 Requires:	nodejs-fast-list
 Requires:	nodejs-fstream
 Requires:	nodejs-graceful-fs >= 1.1.4
@@ -32,8 +31,9 @@
 Requires:	nodejs-semver >= 1.0.13
 Requires:	nodejs-slide-flow-control
 Requires:	nodejs-tar
-Requires:	nodejs-waf
 Requires:	nodejs-which
+Suggests:	nodejs-devel
+Suggests:	nodejs-waf
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -66,18 +66,16 @@
 cp -a bin lib cli.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/npm
 ln -s %{nodejs_libdir}/npm/bin/npm-cli.js $RPM_BUILD_ROOT%{_bindir}/npm
 
+# for npm help
+install -d $RPM_BUILD_ROOT%{nodejs_libdir}/npm/doc
+cp -a doc/cli $RPM_BUILD_ROOT%{nodejs_libdir}/npm/doc/cli
+
 # ghosted global config files
 # TODO: package as files to have file permissions set
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 touch $RPM_BUILD_ROOT%{_sysconfdir}/npmrc
 touch $RPM_BUILD_ROOT%{_sysconfdir}/npmignore
 
-# link node_modules to the right folder so global installation works
-#lrwxrwxrwx    1 root    root               24 jaan  21 17:42 /usr/lib/node_modules -> /usr/lib64/../lib/nodejs
-#drwxr-xr-x    2 root    root                0 jaan  21 17:42 /usr/lib/nodejs/npm
-# TODO: this is wrong, the link should be in nodejs or nodejs itself patched to use lib/nodejs
-#ln -s %{nodejs_libdir} $RPM_BUILD_ROOT%{_prefix}/lib/node_modules
-
 # install to mandir
 install -d $RPM_BUILD_ROOT%{_mandir}
 cp -pr man/* $RPM_BUILD_ROOT%{_mandir}
@@ -119,22 +117,8 @@
 # man symlink
 %{nodejs_libdir}/npm/man
 
-%if 0
-# npm private modules: TODO: use external pkgs
-%dir %{nodejs_libdir}/npm/node_modules
-%{nodejs_libdir}/npm/node_modules/abbrev
-%{nodejs_libdir}/npm/node_modules/graceful-fs
-%{nodejs_libdir}/npm/node_modules/ini
-%{nodejs_libdir}/npm/node_modules/minimatch
-%{nodejs_libdir}/npm/node_modules/node-uuid
-%{nodejs_libdir}/npm/node_modules/nopt
-%{nodejs_libdir}/npm/node_modules/proto-list
-%{nodejs_libdir}/npm/node_modules/request
-%{nodejs_libdir}/npm/node_modules/rimraf
-%{nodejs_libdir}/npm/node_modules/semver
-%{nodejs_libdir}/npm/node_modules/slide
-%{nodejs_libdir}/npm/node_modules/which
-%endif
+%dir %{nodejs_libdir}/npm/doc
+%{nodejs_libdir}/npm/doc/cli
 
 %{_mandir}/man1/npm*
 %{_mandir}/man3/npm*
@@ -145,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2012/01/25 22:45:28  glen
+- add doc/cli files for "help" command; cleanups; some deps optional
+
 Revision 1.2  2012/01/24 21:18:10  glen
 - bare packaging without external deps here
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/npm/npm.spec?r1=1.2&r2=1.3&f=u