- updated to 0.12.2

diff --git a/jobs-alias.patch b/jobs-alias.patch
deleted file mode 100644 (file)
index b763844..0000000
--- a/jobs-alias.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- node-gyp/lib/node-gyp.js   2013-03-09 01:42:19.000000000 +0200
-+++ nodejs-gyp-0.9.5/lib/node-gyp.js   2013-04-07 22:54:31.155021983 +0300
-@@ -97,6 +98,7 @@
-     release: '--no-debug'
-   , C: '--directory'
-   , debug: '--debug'
-+  , j: '--jobs'
-   , silly: '--loglevel=silly'
-   , verbose: '--loglevel=verbose'
- }

diff --git a/nodejs-gyp.spec b/nodejs-gyp.spec
index 0b1b2d6ccca5e95534ffd0bfed8a63498d86e564..b5db537ea101d9e8ba88802cf773531a3ff27f40 100644 (file)
--- a/nodejs-gyp.spec
+++ b/nodejs-gyp.spec
@@ -1,42 +1,41 @@
 %define                pkg     node-gyp
 Summary:       Node.js native addon build tool
 Name:          nodejs-gyp
-Version:       0.9.5
-Release:       2
+Version:       0.12.2
+Release:       1
 License:       MIT
 Group:         Development/Libraries
 URL:           https://github.com/TooTallNate/node-gyp
 Source0:       http://registry.npmjs.org/node-gyp/-/node-gyp-%{version}.tgz
-# Source0-md5: 3d8a5cf4b5b92457af68035bb0e0e96f
-Patch0:                jobs-alias.patch
-Patch1:                system-gyp.patch
-Patch2:                link-libnode.patch
+# Source0-md5: a296a511c2a3f4481862ff62966e0972
+Patch0:                system-gyp.patch
+Patch1:                link-libnode.patch
 BuildRequires: sed >= 4.0
 Requires:      gyp
 Requires:      make
-Requires:      nodejs
+Requires:      nodejs >= 0.8.0
 Requires:      nodejs-devel
-Requires:      nodejs-fstream
-Requires:      nodejs-glob < 4.0.0
-Requires:      nodejs-glob >= 3.0.0
-Requires:      nodejs-graceful-fs < 2.0.0
-Requires:      nodejs-graceful-fs >= 1.0.0
-Requires:      nodejs-minimatch
-Requires:      nodejs-mkdirp
-Requires:      nodejs-nopt < 3.0.0
-Requires:      nodejs-nopt >= 2.0.0
-Requires:      nodejs-npmlog < 1.0.0
-Requires:      nodejs-osenv < 1.0.0
+Requires:      nodejs-fstream < 1
+Requires:      nodejs-glob < 4
+Requires:      nodejs-glob >= 3
+Requires:      nodejs-graceful-fs < 3
+Requires:      nodejs-graceful-fs >= 2
+Requires:      nodejs-minimatch < 1
+Requires:      nodejs-mkdirp < 1
+Requires:      nodejs-nopt < 3
+Requires:      nodejs-nopt >= 2
+Requires:      nodejs-npmlog < 1
+Requires:      nodejs-osenv < 1
 Requires:      nodejs-request < 3
 Requires:      nodejs-request >= 2
-Requires:      nodejs-rimraf < 3.0.0
-Requires:      nodejs-rimraf >= 2.0.0
-Requires:      nodejs-semver < 2.0.0
-Requires:      nodejs-semver >= 1.0.0
-Requires:      nodejs-tar
-Requires:      nodejs-which < 2.0.0
-Requires:      nodejs-which >= 1.0.0
-Requires:      python
+Requires:      nodejs-rimraf < 3
+Requires:      nodejs-rimraf >= 2
+Requires:      nodejs-semver < 2.3.0
+Requires:      nodejs-semver >= 2.2.1
+Requires:      nodejs-tar < 1
+Requires:      nodejs-which < 2
+Requires:      nodejs-which >= 1
+Requires:      python >= 2.7
 Obsoletes:     node-node-gyp
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,7 +51,6 @@ replacement to the node-waf program which is removed for node v0.8.
 mv package/* .
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # fix shebangs
 %{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \
@@ -61,11 +59,9 @@ mv package/* .
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-cp -pr bin lib legacy package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{nodejs_libdir}/%{pkg}}
+cp -pr bin lib package.json $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
 cp -pr *.gyp* $RPM_BUILD_ROOT%{nodejs_libdir}/%{pkg}
-
-install -d $RPM_BUILD_ROOT%{_bindir}
 ln -s %{nodejs_libdir}/%{pkg}/bin/node-gyp.js $RPM_BUILD_ROOT%{_bindir}/node-gyp
 
 %clean
@@ -81,6 +77,3 @@ rm -rf $RPM_BUILD_ROOT
 %{nodejs_libdir}/%{pkg}/lib
 %dir %{nodejs_libdir}/%{pkg}/bin
 %attr(755,root,root) %{nodejs_libdir}/%{pkg}/bin/node-gyp.js
-
-# waf based tools
-%{nodejs_libdir}/%{pkg}/legacy

diff --git a/system-gyp.patch b/system-gyp.patch
index 2af48091fa473d5bdc21061599123fccd76afed8..730aad4d050bbfb6ebe06fcea105db2c7a66cfb5 100644 (file)
--- a/system-gyp.patch
+++ b/system-gyp.patch
@@ -4,7 +4,7 @@
      })
  
      // this logic ported from the old `gyp_addon` python file
--    var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp')
+-    var gyp_script = path.resolve(__dirname, '..', 'gyp', 'gyp_main.py')
 +    var gyp_script = gyp.opts.gyp || path.resolve(__dirname, '..', 'gyp', 'gyp')
      var addon_gypi = path.resolve(__dirname, '..', 'addon.gypi')
      var common_gypi = path.resolve(nodeDir, 'common.gypi')