[node-gyp/el6: 4/5] new upstream release 0.10.6
T.C. Hollingsworth
patches at fedoraproject.org
Fri Jul 12 12:43:21 UTC 2013
commit bfb65c1132e2f1610db5d92a0a3bd5673a76f24b
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date: Fri Jul 12 04:08:22 2013 -0700
new upstream release 0.10.6
.gitignore | 1 +
node-gyp-addon-gypi.patch | 66 ++++++++++++++++++++++++++-------------------
node-gyp.spec | 12 ++++----
sources | 2 +-
4 files changed, 46 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 046da54..abb5f1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/node-gyp-0.9.1.tgz
/node-gyp-0.9.5.tgz
/node-gyp-0.10.1.tgz
+/node-gyp-0.10.6.tgz
diff --git a/node-gyp-addon-gypi.patch b/node-gyp-addon-gypi.patch
index 081bc7d..cf38cb8 100644
--- a/node-gyp-addon-gypi.patch
+++ b/node-gyp-addon-gypi.patch
@@ -1,18 +1,18 @@
-From 01a64d7bf372871e262ab9c8b0d8145f0dcb3700 Mon Sep 17 00:00:00 2001
+From 443f2b72dfaf8b3bec8d295e78efd1369438e962 Mon Sep 17 00:00:00 2001
From: "T.C. Hollingsworth" <tchollingsworth at gmail.com>
-Date: Sat, 5 Jan 2013 02:28:01 -0700
-Subject: [PATCH 1/2] use custom addon.gypi by default instead of downloading
- node source
+Date: Fri, 12 Jul 2013 05:29:05 -0700
+Subject: [PATCH] use custom addon.gypi by default instead of downloading node
+ source
---
- lib/configure.js | 38 ++++++++++++++++++++------------------
- 1 file changed, 20 insertions(+), 18 deletions(-)
+ lib/configure.js | 48 ++++++++++++++++++++++++++----------------------
+ 1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/lib/configure.js b/lib/configure.js
-index 437b839..9765fe1 100644
+index 37c9ad3..57e1da2 100644
--- a/lib/configure.js
+++ b/lib/configure.js
-@@ -202,26 +202,27 @@ function configure (gyp, argv, callback) {
+@@ -207,30 +207,33 @@ 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)
@@ -21,24 +21,25 @@ index 437b839..9765fe1 100644
- versionStr = process.version
- log.verbose('get node dir', 'no --target version specified, falling back to host node version: %s', versionStr)
- }
-
-- // make sure we have a valid version
-- version = semver.parse(versionStr)
-- if (!version) {
-- return callback(new Error('Invalid version number: ' + versionStr))
-- }
++
+ // make sure we have a valid version
-+ version = semver.parse(versionStr)
++ try {
++ version = semver.parse(versionStr)
++ } catch (e) {
++ return callback(e)
++ }
+ if (!version) {
+ 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)
+- // make sure we have a valid version
+- try {
+- version = semver.parse(versionStr)
+- } catch (e) {
+- return callback(e)
+- }
+- if (!version) {
+- 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) {
@@ -48,16 +49,25 @@ index 437b839..9765fe1 100644
+ createBuildDir()
+ })
+ } else {
-+ // 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 = '/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 = '/usr/share/node'
++ createBuildDir()
+ }
+
+- // 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()
- })
-+ }
++
}
}
-@@ -374,7 +375,8 @@ function configure (gyp, argv, callback) {
+@@ -383,7 +386,8 @@ function configure (gyp, argv, callback) {
// this logic ported from the old `gyp_addon` python file
var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp')
@@ -68,5 +78,5 @@ index 437b839..9765fe1 100644
var output_dir = 'build'
if (win) {
--
-1.8.1.4
+1.8.3.1
diff --git a/node-gyp.spec b/node-gyp.spec
index aa3ddaf..4ff96b2 100644
--- a/node-gyp.spec
+++ b/node-gyp.spec
@@ -1,7 +1,7 @@
%{?nodejs_find_provides_and_requires}
Name: node-gyp
-Version: 0.10.1
+Version: 0.10.6
Release: 1%{?dist}
Summary: Node.js native addon build tool
License: MIT
@@ -43,10 +43,7 @@ program which is removed for node v0.8.
%patch1 -p1
%patch2 -p1
-%nodejs_fixdep request
-
-#remove the bundled gyp
-rm -rf gyp
+%nodejs_fixdep request 2.x
%build
#nothing to do
@@ -55,7 +52,7 @@ rm -rf gyp
rm -rf %{buildroot}
mkdir -p %{buildroot}%{nodejs_sitelib}/node-gyp
-cp -pr addon*.gypi bin lib legacy package.json %{buildroot}%{nodejs_sitelib}/node-gyp
+cp -pr addon*.gypi bin lib package.json %{buildroot}%{nodejs_sitelib}/node-gyp
cp -p %{SOURCE1} %{buildroot}%{nodejs_sitelib}/node-gyp/addon-rpm.gypi
mkdir -p %{buildroot}%{_bindir}
@@ -73,6 +70,9 @@ rm -rf %{buildroot}
%doc README.md LICENSE
%changelog
+* Fri Jul 12 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.6-1
+- new upstream release 0.10.6
+
* Sat Jun 22 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.1-1
- new upstream release 0.10.1
diff --git a/sources b/sources
index 5fac1c8..01c9cd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38ba840286f98ef97e5df7d25277b37c node-gyp-0.10.1.tgz
+a683a9f119d8eeebc53aa6c6d5b0d6bb node-gyp-0.10.6.tgz
More information about the scm-commits
mailing list