[packages/npm] - updated to 6.9.0
hawk
hawk at pld-linux.org
Wed May 29 10:56:01 CEST 2019
commit 51bf9289aac45463f8e621f3b2f440738f2e5927
Author: Marcin Krol <hawk at tld-linux.org>
Date: Wed May 29 10:49:05 2019 +0200
- updated to 6.9.0
cmd-shim-optional.patch | 36 +++++++++++++++++++-----------------
link-globalPaths.patch | 5 +++--
npm.spec | 27 +++++++++++++++++----------
3 files changed, 39 insertions(+), 29 deletions(-)
---
diff --git a/npm.spec b/npm.spec
index 52944b7..70f605b 100644
--- a/npm.spec
+++ b/npm.spec
@@ -8,12 +8,12 @@
Summary: A package manager for node.js
Name: npm
-Version: 3.10.8
-Release: 2
+Version: 6.9.0
+Release: 1
License: Artistic-2.0
Group: Development/Libraries
Source0: http://registry.npmjs.org/npm/-/%{name}-%{version}.tgz
-# Source0-md5: f470ec0065a5a181a432f008a3a97dda
+# Source0-md5: 37d19666ae627bc5f8acdab48a8a0eed
Patch0: link-globalPaths.patch
Patch1: cmd-shim-optional.patch
URL: http://npmjs.org/
@@ -57,16 +57,17 @@ mv package/* .
# fix shebangs
%{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \
bin/npm-cli.js \
- cli.js
+ bin/npx-cli.js
# startup helpers we don't need
rm bin/npm bin/npm.cmd
# clean up node_modules/
-for i in README.md Readme.md README.markdown LICENSE LICENSE.md CHANGES.md \
- changelog.md .npmignore .travis.yml test examples example samples; do
+for i in README.markdown LICENSE \
+ .npmignore .travis.yml test examples example samples; do
find node_modules -name $i -print0 | sort -rz | xargs -0r rm -rv
done
+find node_modules -name \*.md -print0 -exec rm -v {} \;
rm lib/fetch-package-metadata.md
%build
@@ -82,9 +83,10 @@ rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_bindir},%{nodejs_libdir}/npm/bin,/etc/bash_completion.d}
install -d $RPM_BUILD_ROOT%{nodejs_libdir}/npm/bin
-cp -a lib cli.js npmrc package.json $RPM_BUILD_ROOT%{nodejs_libdir}/npm
+cp -a lib npmrc package.json $RPM_BUILD_ROOT%{nodejs_libdir}/npm
cp -p bin/*.js $RPM_BUILD_ROOT%{nodejs_libdir}/npm/bin
ln -s %{nodejs_libdir}/npm/bin/npm-cli.js $RPM_BUILD_ROOT%{_bindir}/npm
+ln -s %{nodejs_libdir}/npm/bin/npx-cli.js $RPM_BUILD_ROOT%{_bindir}/npx
%if %{without bundled_gyp}
rm -r node_modules/node-gyp
@@ -120,19 +122,21 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/npmrc
%ghost %{_sysconfdir}/npmignore
%attr(755,root,root) %{_bindir}/npm
+%attr(755,root,root) %{_bindir}/npx
%dir %{nodejs_libdir}/npm
%{nodejs_libdir}/npm/package.json
-%{nodejs_libdir}/npm/cli.js
%{nodejs_libdir}/npm/npmrc
%dir %{nodejs_libdir}/npm/bin
%attr(755,root,root) %{nodejs_libdir}/npm/bin/npm-cli.js
-%attr(755,root,root) %{nodejs_libdir}/npm/bin/read-package-json.js
+%attr(755,root,root) %{nodejs_libdir}/npm/bin/npx-cli.js
%dir %{nodejs_libdir}/npm/lib
%{nodejs_libdir}/npm/lib/*.js
-%{nodejs_libdir}/npm/lib/cache
+%{nodejs_libdir}/npm/lib/auth
%{nodejs_libdir}/npm/lib/config
+%{nodejs_libdir}/npm/lib/doctor
%{nodejs_libdir}/npm/lib/install
+%{nodejs_libdir}/npm/lib/search
%{nodejs_libdir}/npm/lib/utils
%{nodejs_libdir}/npm/node_modules
@@ -143,10 +147,13 @@ rm -rf $RPM_BUILD_ROOT
%{nodejs_libdir}/npm/doc/cli
%{nodejs_libdir}/npm/doc/files
%{nodejs_libdir}/npm/doc/misc
+%{nodejs_libdir}/npm/doc/spec
%{_mandir}/man1/npm*
+%{_mandir}/man1/npx*
%{_mandir}/man5/npm*
%{_mandir}/man5/package.json.5*
+%{_mandir}/man5/package-lock.json.5*
%{_mandir}/man7/npm*
%{_mandir}/man7/removing-npm.7*
%{_mandir}/man7/semver.7*
diff --git a/cmd-shim-optional.patch b/cmd-shim-optional.patch
index bd61a68..54c71f9 100644
--- a/cmd-shim-optional.patch
+++ b/cmd-shim-optional.patch
@@ -1,21 +1,23 @@
---- npm-3.10.8/lib/build.js.orig 2016-07-01 22:52:19.000000000 +0200
-+++ npm-3.10.8/lib/build.js 2016-09-12 09:38:31.069484189 +0200
-@@ -16,7 +16,7 @@
- var readJson = require('read-package-json')
- var link = require('./utils/link.js')
- var linkIfExists = link.ifExists
+diff -ur package.orig/node_modules/read-cmd-shim/test/integration.js package/node_modules/read-cmd-shim/test/integration.js
+--- package.orig/node_modules/read-cmd-shim/test/integration.js 1985-10-26 09:15:00.000000000 +0100
++++ package/node_modules/read-cmd-shim/test/integration.js 2019-05-20 14:27:58.398000000 +0200
+@@ -3,7 +3,7 @@
+ var fs = require('graceful-fs')
+ var test = require('tap').test
+ var rimraf = require('rimraf')
-var cmdShim = require('cmd-shim')
+var cmdShim = (process.platform === "win32") ? require("cmd-shim") : {}
- var cmdShimIfExists = cmdShim.ifExists
- var asyncMap = require('slide').asyncMap
- var ini = require('ini')
---- npm-3.10.8/package.json.orig 2016-09-09 03:21:47.000000000 +0200
-+++ npm-3.10.8/package.json 2016-09-12 09:38:42.202817644 +0200
-@@ -37,7 +37,6 @@
- "archy": "~1.0.0",
- "asap": "~2.0.4",
- "chownr": "~1.0.1",
+ var readCmdShim = require('../index.js')
+ var workDir = path.join(__dirname, path.basename(__filename, '.js'))
+ var testShbang = path.join(workDir, 'test-shbang')
+diff -ur package.orig/package.json package/package.json
+--- package.orig/package.json 1985-10-26 09:15:00.000000000 +0100
++++ package/package.json 2019-05-20 14:28:25.366000000 +0200
+@@ -48,7 +48,6 @@
+ "ci-info": "^2.0.0",
+ "cli-columns": "^3.1.2",
+ "cli-table3": "^0.5.1",
- "cmd-shim": "~2.0.2",
"columnify": "~1.5.4",
- "config-chain": "~1.1.10",
- "dezalgo": "~1.0.3",
+ "config-chain": "^1.1.12",
+ "detect-indent": "~5.0.0",
diff --git a/link-globalPaths.patch b/link-globalPaths.patch
index 1b36caa..12d3bd5 100644
--- a/link-globalPaths.patch
+++ b/link-globalPaths.patch
@@ -1,5 +1,6 @@
---- npm-3.10.8/lib/link.js.orig 2016-07-01 22:52:19.000000000 +0200
-+++ npm-3.10.8/lib/link.js 2016-09-12 09:55:21.476161853 +0200
+diff -ur package.orig/lib/link.js package/lib/link.js
+--- package.orig/lib/link.js 1985-10-26 09:15:00.000000000 +0100
++++ package/lib/link.js 2019-05-20 14:27:13.126000000 +0200
@@ -8,6 +8,7 @@
var asyncMap = require('slide').asyncMap
var chain = require('slide').chain
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/npm.git/commitdiff/51bf9289aac45463f8e621f3b2f440738f2e5927
More information about the pld-cvs-commit
mailing list