From f893449c3b2922482c70bdc58374b66c771d6bd1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 04 2015 08:08:49 +0000 Subject: import nodejs010-node-gyp-1.0.2-3.el7 --- diff --git a/.gitignore b/.gitignore index 2814b12..b8f3b99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/node-gyp-0.12.2.tgz +SOURCES/node-gyp-1.0.2.tgz diff --git a/.nodejs010-node-gyp.metadata b/.nodejs010-node-gyp.metadata index a84a214..4a21788 100644 --- a/.nodejs010-node-gyp.metadata +++ b/.nodejs010-node-gyp.metadata @@ -1 +1 @@ -bdca7e7025feb308ddd7fd3434300e47703ec57a SOURCES/node-gyp-0.12.2.tgz +b0bb6d2d762271408dd904853e7aa3000ed2eb57 SOURCES/node-gyp-1.0.2.tgz diff --git a/SOURCES/node-gyp-addon-gypi.patch b/SOURCES/node-gyp-addon-gypi.patch index 5005c68..622f5e8 100644 --- a/SOURCES/node-gyp-addon-gypi.patch +++ b/SOURCES/node-gyp-addon-gypi.patch @@ -1,19 +1,19 @@ -From d2dbe4c41b0f3e0608430acfbf9fc342d396f7de Mon Sep 17 00:00:00 2001 +From 6de79d3d2b661b25b99d4deb9c5792ee626b835d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= -Date: Tue, 4 Mar 2014 16:04:16 +0100 +Date: Thu, 29 Jan 2015 15:26:54 +0100 Subject: [PATCH] use custom addon.gypi by default instead of downloading node back port of original patch http://pkgs.fedoraproject.org/cgit/node-gyp.git/tree/node-gyp-addon-gypi.patch --- - lib/configure.js | 45 +++++++++++++++++++++++---------------------- - 1 file changed, 23 insertions(+), 22 deletions(-) + lib/configure.js | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/configure.js b/lib/configure.js -index 1770e76..6829310 100644 +index 6f4fd40..1a003c4 100644 --- a/lib/configure.js +++ b/lib/configure.js -@@ -129,30 +129,30 @@ function configure (gyp, argv, callback) { +@@ -131,30 +131,29 @@ function configure (gyp, argv, callback) { // if --target was given, then determine a target version to compile for versionStr = gyp.opts.target log.verbose('get node dir', 'compiling against --target node version: %s', versionStr) @@ -27,23 +27,23 @@ index 1770e76..6829310 100644 + return callback(new Error('Invalid version number: ' + versionStr)) + } + // ensure that the target node version's dev files are installed -+ gyp.opts.ensure = true -+ gyp.commands.install([ versionStr ], function (err, version) { -+ if (err) return callback(err) -+ log.verbose('get node dir', 'target node version installed:', version) -+ nodeDir = path.resolve(gyp.devDir, version) -+ createBuildDir() -+ }) ++ gyp.opts.ensure = true ++ gyp.commands.install([ versionStr ], function (err, version) { ++ if (err) return callback(err) ++ log.verbose('get node dir', 'target node version installed:', version) ++ nodeDir = path.resolve(gyp.devDir, version) ++ createBuildDir() ++ }) } else { - // if no --target was specified then use the current host node version - versionStr = process.version - log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', versionStr) -+ // if no --target was specified then use RPM-installed headers -+ log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') -+ nodeDir = '/opt/rh/nodejs010/root/usr/share/node' -+ createBuildDir() ++ // if no --target was specified then use RPM-installed headers ++ log.verbose('get node dir', 'no --target version specified, falling back to RPM installed headers') ++ nodeDir = '/opt/rh/nodejs010/root/usr/share/node' ++ createBuildDir() } - +- - // make sure we have a valid version - try { - version = semver.parse(versionStr) @@ -65,7 +65,7 @@ index 1770e76..6829310 100644 } } -@@ -296,7 +296,8 @@ function configure (gyp, argv, callback) { +@@ -298,7 +297,8 @@ function configure (gyp, argv, callback) { // this logic ported from the old `gyp_addon` python file var gyp_script = '/opt/rh/v8314/root/usr/bin/gyp' diff --git a/SOURCES/node-gyp-use-system-gyp.patch b/SOURCES/node-gyp-use-system-gyp.patch index 9cb8d91..57e8d0e 100644 --- a/SOURCES/node-gyp-use-system-gyp.patch +++ b/SOURCES/node-gyp-use-system-gyp.patch @@ -1,6 +1,6 @@ -From 7fda2be94434dde9698cbd7fb4f48eb6a42e09d9 Mon Sep 17 00:00:00 2001 +From f38147792fde04e1b223216ca6283777eb2022ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hr=C4=8Dka?= -Date: Thu, 16 Jan 2014 13:35:22 +0100 +Date: Fri, 30 Jan 2015 08:56:50 +0100 Subject: [PATCH] Use system gyp --- @@ -8,10 +8,10 @@ Subject: [PATCH] Use system gyp 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configure.js b/lib/configure.js -index e101a31..1770e76 100644 +index 68f26d6..6f4fd40 100644 --- a/lib/configure.js +++ b/lib/configure.js -@@ -295,7 +295,7 @@ function configure (gyp, argv, callback) { +@@ -297,7 +297,7 @@ function configure (gyp, argv, callback) { }) // this logic ported from the old `gyp_addon` python file diff --git a/SPECS/node-gyp.spec b/SPECS/node-gyp.spec index 0353eef..0a6d020 100644 --- a/SPECS/node-gyp.spec +++ b/SPECS/node-gyp.spec @@ -4,8 +4,8 @@ %{?nodejs_find_provides_and_requires} Name: %{?scl_prefix}node-gyp -Version: 0.12.2 -Release: 2%{?dist} +Version: 1.0.2 +Release: 3%{?dist} Summary: Node.js native addon build tool License: MIT Group: System Environment/Libraries @@ -44,7 +44,9 @@ program which is removed for node v0.8. %patch2 -p1 %patch1 -p1 %nodejs_fixdep request 2.x -%nodejs_fixdep semver 2.1 +%nodejs_fixdep semver 2.x +%nodejs_fixdep nopt 3.x +%nodejs_fixdep glob 4.x %build #nothing to do @@ -71,6 +73,13 @@ rm -rf %{buildroot} %doc README.md LICENSE %changelog +* Thu Jan 29 2015 Tomas Hrcka - 1.0.2-3 +- Fix dependencies versions of nopt and glob +- Backport Patch1 to new sources + +* Thu Jan 08 2015 Tomas Hrcka - 1.0.2-1 +- New upstream release + * Tue Mar 04 2014 Tomas Hrcka - 0.12.2-2 - Fix addon-rpm-gypi - Backport patch to new sources