packages: npm/npm.spec - up to 1.1.0-2, deps were already for that

[glen]

Author: glen                         Date: Wed Jan 25 23:25:57 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.1.0-2, deps were already for that

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

---- Diffs:

================================================================
Index: packages/npm/npm.spec
diff -u packages/npm/npm.spec:1.3 packages/npm/npm.spec:1.4
--- packages/npm/npm.spec:1.3	Wed Jan 25 23:45:28 2012
+++ packages/npm/npm.spec	Thu Jan 26 00:25:51 2012
@@ -1,16 +1,16 @@
 # $Revision$, $Date$
 # TODO
-# - man fixes: npm ERR! Error: ENOENT, no such file or directory '/usr/lib/node_modules/npm/man/man1/'
+# - it can't live without this path: Error: ENOENT, no such file or directory '/usr/lib/node_modules/npm/man/man1/'
 # - npm-debug.log is created with 777 perms, should respect umask instead
 Summary:	A package manager for node.js
 Name:		npm
-Version:	1.0.106
-Release:	0.8
+Version:    1.1.0
+Release:	0.9
 License:	MIT License
 Group:		Development/Libraries
 URL:		http://npmjs.org/
-Source0:	http://registry.npmjs.org/npm/-/%{name}-%{version}.tgz
-# Source0-md5:	44f82461713f911d9a01f194bdc891bd
+Source0:    http://registry.npmjs.org/npm/-/npm-%{version}-2.tgz
+# Source0-md5:	f3beb0775b52ac3235f814b59efc5824
 BuildRequires:	nodejs >= 0.4
 Requires:	nodejs
 Requires:	nodejs-abbrev >= 1.0.3
@@ -48,6 +48,15 @@
 %setup -qc
 mv package/* .
 
+# fix shebangs
+%{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \
+	bin/npm-cli.js \
+	cli.js \
+	lib/utils/cmd-shim.js \
+
+# startup helpers we don't need
+rm bin/npm bin/npm.cmd
+
 # prefix all manpages with "npm-"
 for dir in man/man*; do
     cd $dir
@@ -63,12 +72,12 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{nodejs_libdir}/npm}
 
-cp -a bin lib cli.js package.json $RPM_BUILD_ROOT%{nodejs_libdir}/npm
+cp -a bin lib 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
+cp -a doc/* $RPM_BUILD_ROOT%{nodejs_libdir}/npm/doc
 
 # ghosted global config files
 # TODO: package as files to have file permissions set
@@ -84,6 +93,7 @@
 ln -s %{_mandir} $RPM_BUILD_ROOT%{nodejs_libdir}/npm/man
 
 # TODO bash-completion separate package
+rm $RPM_BUILD_ROOT%{nodejs_libdir}/npm/lib/utils/completion.sh
 
 %if 0
 %post
@@ -109,7 +119,6 @@
 %attr(755,root,root) %{nodejs_libdir}/npm/bin/npm-cli.js
 %attr(755,root,root) %{nodejs_libdir}/npm/bin/npm-get-uid-gid.js
 %attr(755,root,root) %{nodejs_libdir}/npm/bin/read-package-json.js
-%{nodejs_libdir}/npm/cli.js
 %dir %{nodejs_libdir}/npm/lib
 %{nodejs_libdir}/npm/lib/*.js
 %{nodejs_libdir}/npm/lib/utils
@@ -119,6 +128,7 @@
 
 %dir %{nodejs_libdir}/npm/doc
 %{nodejs_libdir}/npm/doc/cli
+%{nodejs_libdir}/npm/doc/api
 
 %{_mandir}/man1/npm*
 %{_mandir}/man3/npm*
@@ -129,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2012/01/25 23:25:51  glen
+- up to 1.1.0-2, deps were already for that
+
 Revision 1.3  2012/01/25 22:45:28  glen
 - add doc/cli files for "help" command; cleanups; some deps optional
 
================================================================

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