packages: npm/npm.spec - rel 1

[glen]

Author: glen                         Date: Thu Jan 26 16:38:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 1

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

---- Diffs:

================================================================
Index: packages/npm/npm.spec
diff -u packages/npm/npm.spec:1.4 packages/npm/npm.spec:1.5
--- packages/npm/npm.spec:1.4	Thu Jan 26 00:25:51 2012
+++ packages/npm/npm.spec	Thu Jan 26 17:38:41 2012
@@ -1,17 +1,22 @@
 # $Revision$, $Date$
 # TODO
+# - put man3 to some -devel-doc package (man pages for npm programming)
 # - 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
+# - global config seems wrong:
+# $ npm config get globalconfig
+# /usr/etc/npmrc
 Summary:	A package manager for node.js
 Name:		npm
-Version:    1.1.0
-Release:	0.9
+Version:	1.1.0
+Release:	1
 License:	MIT License
 Group:		Development/Libraries
 URL:		http://npmjs.org/
-Source0:    http://registry.npmjs.org/npm/-/npm-%{version}-2.tgz
+Source0:	http://registry.npmjs.org/npm/-/%{name}-%{version}-2.tgz
 # Source0-md5:	f3beb0775b52ac3235f814b59efc5824
 BuildRequires:	nodejs >= 0.4
+BuildRequires:	rpmbuild(macros) >= 1.634
 Requires:	nodejs
 Requires:	nodejs-abbrev >= 1.0.3
 Requires:	nodejs-block-stream
@@ -32,13 +37,11 @@
 Requires:	nodejs-slide-flow-control
 Requires:	nodejs-tar
 Requires:	nodejs-which
-Suggests:	nodejs-devel
+# waf used for binary packages
 Suggests:	nodejs-waf
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		nodejs_libdir %{_prefix}/lib/node_modules
-
 %description
 NPM is a package manager for node.js. You can use it to install and
 publish your node programs. It manages dependencies and does other
@@ -59,13 +62,13 @@
 
 # prefix all manpages with "npm-"
 for dir in man/man*; do
-    cd $dir
-    for page in *; do
-        if [[ $page != npm* ]]; then
-            mv $page npm-$page
-        fi
-    done
-    cd -
+	cd $dir
+	for page in *; do
+		if [[ $page != npm* ]]; then
+			mv $page npm-$page
+		fi
+	done
+	cd -
 done
 
 %install
@@ -109,9 +112,7 @@
 %doc AUTHORS LICENSE README.md doc/cli/changelog.md
 %ghost %{_sysconfdir}/npmrc
 %ghost %{_sysconfdir}/npmignore
-%attr(755,root,root) %{_bindir}/npm*
-# TODO: top dir to nodejs package
-%dir %{nodejs_libdir}
+%attr(755,root,root) %{_bindir}/npm
 %dir %{nodejs_libdir}/npm
 %{nodejs_libdir}/npm/package.json
 
@@ -139,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/01/26 16:38:41  glen
+- rel 1
+
 Revision 1.4  2012/01/25 23:25:51  glen
 - up to 1.1.0-2, deps were already for that
 
================================================================

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