From ca3deb25aea40450b056174ed4d30ab875c90bda Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Dec 21 2019 12:19:04 +0000 Subject: Update to 1.3.0 upstream release --- diff --git a/.gitignore b/.gitignore index 97f62be..b8dda13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /globule-0.1.0.tgz /globule-0.2.0.tgz /nodejs-globule-1.2.1.tar.gz +/nodejs-globule-1.3.0.tar.gz diff --git a/nodejs-globule-lodash3.patch b/nodejs-globule-lodash3.patch deleted file mode 100644 index be6364d..0000000 --- a/nodejs-globule-lodash3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From eb00aa591172c473835ff73285680e7422956257 Mon Sep 17 00:00:00 2001 -From: Anton Harniakou -Date: Wed, 25 Nov 2015 18:25:17 +0300 -Subject: [PATCH] Use lodash v3 - -There are some breaking changes in lodash v3, -such as flatten has become shallow. -This commit takes that into account and replaces _.flatten with -_.flattenDeep. ---- - lib/globule.js | 8 ++++---- - package.json | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/globule.js b/lib/globule.js -index 5a3eeac..7c6328e 100644 ---- a/lib/globule.js -+++ b/lib/globule.js -@@ -46,8 +46,8 @@ globule.match = function(patterns, filepaths, options) { - // Return empty set if either patterns or filepaths was omitted. - if (patterns == null || filepaths == null) { return []; } - // Normalize patterns and filepaths to flattened arrays. -- patterns = _.isArray(patterns) ? _.flatten(patterns) : [patterns]; -- filepaths = _.isArray(filepaths) ? _.flatten(filepaths) : [filepaths]; -+ patterns = _.isArray(patterns) ? _.flattenDeep(patterns) : [patterns]; -+ filepaths = _.isArray(filepaths) ? _.flattenDeep(filepaths) : [filepaths]; - // Return empty set if there are no patterns or filepaths. - if (patterns.length === 0 || filepaths.length === 0) { return []; } - // Return all matching filepaths. -@@ -71,9 +71,9 @@ globule.find = function() { - // arguments. Flatten nested arrays. - var patterns; - if (options.src) { -- patterns = _.isArray(options.src) ? _.flatten(options.src) : [options.src]; -+ patterns = _.isArray(options.src) ? _.flattenDeep(options.src) : [options.src]; - } else { -- patterns = _.flatten(args); -+ patterns = _.flattenDeep(args); - } - // Return empty set if there are no patterns. - if (patterns.length === 0) { return []; } -diff --git a/package.json b/package.json -index e040dc3..cfdfb57 100644 ---- a/package.json -+++ b/package.json -@@ -45,7 +45,7 @@ - "awesome" - ], - "dependencies": { -- "lodash": "~2.4.1", -+ "lodash": "~3.10.1", - "glob": "~3.2.7", - "minimatch": "~0.2.11" - } diff --git a/nodejs-globule.spec b/nodejs-globule.spec index 42c9b94..a9f5c5e 100644 --- a/nodejs-globule.spec +++ b/nodejs-globule.spec @@ -3,7 +3,7 @@ %global enable_tests 1 Name: nodejs-globule -Version: 1.2.1 +Version: 1.3.0 Release: 1%{?dist} Summary: An easy-to-use wildcard globbing library for Node.js @@ -29,8 +29,6 @@ BuildRequires: npm(lodash) %prep %autosetup -p 1 -n node-globule-%{version} %nodejs_fixdep glob "^6.0.3" -%nodejs_fixdep lodash "^4.17.15" -%nodejs_fixdep minimatch "^3.0.0" %build @@ -58,9 +56,12 @@ cp -pr package.json lib/ \ %changelog +* Sat Dec 21 2019 Tom Hughes - 1.3.0-1 +- Update to 1.3.0 upstream release + * Sat Sep 14 2019 Tom Hughes - 1.2.1-1 - Update to 1.2.1 upstream release -- Upodate npm(lodash) dependency +- Update npm(lodash) dependency * Thu Jul 25 2019 Fedora Release Engineering - 0.2.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 9e683de..1ca0d84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nodejs-globule-1.2.1.tar.gz) = 0a64a593ac83237b718e7dd400f0802361379743ec8ff06283f7719174867f36b75b7f7d8eb8ba42bdeb472d3e3b01155c9a4a6dad661214248aa83e33ad536c +SHA512 (nodejs-globule-1.3.0.tar.gz) = 9a19a16c52a015e57e404c05c16a726a6626d798f421b3825dd9b1fe43cd2870cf56ea613e5006f08be639dd6bfef8f15cd2fd9050148342ce3a0495fde67c49