diff --git a/npm/npm.patch b/npm/npm.patch index 54e8f287cc..23bf66532e 100644 --- a/npm/npm.patch +++ b/npm/npm.patch @@ -1,19 +1,7 @@ -Index: lib/build.js ---- lib/build.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ lib/build.js 2017-09-01 11:34:57.271139000 +0200 -@@ -218,7 +218,7 @@ - function linkMans (pkg, folder, parent, gtop, cb) { - if (!pkg.man || !gtop || process.platform === 'win32') return cb() - -- var manRoot = path.resolve(npm.config.get('prefix'), 'share', 'man') -+ var manRoot = path.resolve(npm.config.get('prefix'), 'man') - log.verbose('linkMans', 'man files are', pkg.man, 'in', manRoot) - - // make sure that the mans are unique. Index: lib/config/core.js ---- lib/config/core.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ lib/config/core.js 2017-09-01 11:34:57.271300000 +0200 -@@ -298,7 +298,7 @@ +--- lib/config/core.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ lib/config/core.js 2017-11-28 19:57:20.298797000 +0100 +@@ -297,7 +297,7 @@ fs.writeFile(target.path, data, 'utf8', function (er) { if (er) return then(er) if (where === 'user' && myUid && myGid) { @@ -23,9 +11,9 @@ Index: lib/config/core.js then() } Index: lib/npm.js ---- lib/npm.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ lib/npm.js 2017-09-01 11:34:57.271446000 +0200 -@@ -400,9 +400,7 @@ +--- lib/npm.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ lib/npm.js 2017-11-28 19:57:20.299013000 +0100 +@@ -410,9 +410,7 @@ Object.defineProperty(npm, 'globalDir', { get: function () { @@ -37,8 +25,8 @@ Index: lib/npm.js enumerable: true }) Index: lib/search/all-package-metadata.js ---- lib/search/all-package-metadata.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ lib/search/all-package-metadata.js 2017-09-01 11:34:57.271612000 +0200 +--- lib/search/all-package-metadata.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ lib/search/all-package-metadata.js 2017-11-28 19:57:20.299219000 +0100 @@ -3,7 +3,6 @@ var fs = require('graceful-fs') var path = require('path') @@ -56,9 +44,21 @@ Index: lib/search/all-package-metadata.js }) }) } +Index: lib/unbuild.js +--- lib/unbuild.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ lib/unbuild.js 2017-11-28 20:00:23.989689000 +0100 +@@ -96,7 +96,7 @@ + !npm.config.get('global')) { + return cb() + } +- var manRoot = path.resolve(npm.config.get('prefix'), 'share', 'man') ++ var manRoot = path.resolve(npm.config.get('prefix'), 'man') + log.verbose('rmMans', 'man files are', pkg.man, 'in', manRoot) + asyncMap(pkg.man, function (man, cb) { + if (Array.isArray(man)) { Index: lib/utils/correct-mkdir.js ---- lib/utils/correct-mkdir.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ lib/utils/correct-mkdir.js 2017-09-01 11:34:57.271733000 +0200 +--- lib/utils/correct-mkdir.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ lib/utils/correct-mkdir.js 2017-11-28 19:57:20.299397000 +0100 @@ -1,4 +1,3 @@ -var chownr = require('chownr') var dezalgo = require('dezalgo') @@ -74,10 +74,22 @@ Index: lib/utils/correct-mkdir.js - }) + cb(null, st) } +Index: node_modules/bin-links/index.js +--- node_modules/bin-links/index.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ node_modules/bin-links/index.js 2017-11-28 20:00:56.752077000 +0100 +@@ -151,7 +151,7 @@ + function linkMans (pkg, folder, parent, gtop, opts, cb) { + if (!pkg.man || !gtop || process.platform === 'win32') return cb() + +- var manRoot = path.resolve(opts.prefix, 'share', 'man') ++ var manRoot = path.resolve(opts.prefix, 'man') + opts.log.verbose('linkMans', 'man files are', pkg.man, 'in', manRoot) + + // make sure that the mans are unique. Index: node_modules/npm-lifecycle/index.js ---- node_modules/npm-lifecycle/index.js.orig 2017-08-23 02:53:03.000000000 +0200 -+++ node_modules/npm-lifecycle/index.js 2017-09-01 12:02:07.839912000 +0200 -@@ -156,7 +156,6 @@ +--- node_modules/npm-lifecycle/index.js.orig 2017-11-28 04:37:46.000000000 +0100 ++++ node_modules/npm-lifecycle/index.js 2017-11-28 19:57:20.299620000 +0100 +@@ -161,7 +161,6 @@ if (cfgsetting === 'warn-only') { if (isDifferentNodeInPath && !shouldPrependCurrentNodeDirToPATH.hasWarned) { if (foundExecPath) { diff --git a/npm/npm.spec b/npm/npm.spec index 7a8732fb5b..05d229f75b 100644 --- a/npm/npm.spec +++ b/npm/npm.spec @@ -22,7 +22,7 @@ ## # package version -%define V_npm 5.5.1 +%define V_npm 5.6.0 %define V_node9 9.2.0 %define V_node8 8.9.1 %define V_node6 6.12.0 @@ -40,7 +40,7 @@ Class: PLUS Group: Archiver License: MIT Version: %{V_npm} -Release: 20171115 +Release: 20171128 # list of sources Source0: https://github.com/npm/npm/archive/v%{V_npm}.tar.gz