[nodejs-sqlite3] Update to 2.2.4 upstream release

[Tom Hughes]

commit e3233280536d4b4889ef023bbfaa6a6aafb8fbc8
Author: Tom Hughes <tom at compton.nu>
Date:   Wed Jul 16 11:16:03 2014 +0100

    Update to 2.2.4 upstream release

 .gitignore                  |    1 +
 nodejs-sqlite3-pregyp.patch |   27 ++++++++++++---------------
 nodejs-sqlite3.spec         |   17 +++++++++++++----
 sources                     |    2 +-
 4 files changed, 27 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f05d775..fff2ec9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /sqlite3-2.2.0.tgz
 /node-sqlite3-75ddb77984ce1639b5520d07aa608c17f2d1552a.tar.gz
 /node-sqlite3-b3cbf17df6b0a1b4384e10e900f658c04bb73f44.tar.gz
+/node-sqlite3-9a6a197d1177939003282c58378f51192fd67c1a.tar.gz
diff --git a/nodejs-sqlite3-pregyp.patch b/nodejs-sqlite3-pregyp.patch
index 15b89cb..aaf1c92 100644
--- a/nodejs-sqlite3-pregyp.patch
+++ b/nodejs-sqlite3-pregyp.patch
@@ -1,33 +1,30 @@
-commit 5e170d98aa8df2139aa97d3970cd7ee88f82c181
+commit 786906cc379750c7b84e58d538df054ee07970c6
 Author: Tom Hughes <tom at compton.nu>
 Date:   Mon Apr 14 10:57:00 2014 +0100
 
     Patch out use of node-pre-gyp
 
 diff --git a/lib/sqlite3.js b/lib/sqlite3.js
-index 6332584..b08c5d9 100644
+index 466b902..b27f974 100644
 --- a/lib/sqlite3.js
 +++ b/lib/sqlite3.js
-@@ -1,7 +1,6 @@
- var path = require('path');
+@@ -1,6 +1,5 @@
 -var binary = require('node-pre-gyp');
- var path = require('path')
+ var path = require('path');
 -var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
 +var binding_path = path.resolve(path.join(__dirname,'binding/node_sqlite3.node'));
  var binding = require(binding_path);
  var sqlite3 = module.exports = exports = binding;
- var util = require('util');
+ var EventEmitter = require('events').EventEmitter;
 diff --git a/package.json b/package.json
-index 70f8c5d..f8850b5 100644
+index 5e99230..dc2c5a6 100644
 --- a/package.json
 +++ b/package.json
-@@ -35,9 +35,6 @@
-         "type": "git",
-         "url": "git://github.com/mapbox/node-sqlite3.git"
+@@ -37,7 +37,6 @@
+     },
+     "dependencies": {
+         "nan": "1.1.2",
+-        "node-pre-gyp": "0.5.19",
+         "set-immediate": "0.1.1"
      },
--    "dependencies": {
--        "node-pre-gyp": "0.5.x"
--    },
      "bundledDependencies": [
-         "node-pre-gyp"
-     ],
diff --git a/nodejs-sqlite3.spec b/nodejs-sqlite3.spec
index c891858..49e6707 100644
--- a/nodejs-sqlite3.spec
+++ b/nodejs-sqlite3.spec
@@ -1,8 +1,8 @@
-%global commit b3cbf17df6b0a1b4384e10e900f658c04bb73f44
+%global commit 9a6a197d1177939003282c58378f51192fd67c1a
 
 Name:           nodejs-sqlite3
-Version:        2.2.3
-Release:        2%{?dist}
+Version:        2.2.4
+Release:        1%{?dist}
 Summary:        Asynchronous, non-blocking SQLite3 bindings for Node.js
 
 License:        BSD
@@ -16,8 +16,9 @@ BuildRequires:  nodejs-devel
 BuildRequires:  node-gyp
 BuildRequires:  sqlite-devel
 
+BuildRequires:  npm(nan) >= 1.1.2
 BuildRequires:  npm(mocha)
-BuildRequires:  npm(step)
+BuildRequires:  npm(set-immediate)
 
 %{?nodejs_default_filter}
 
@@ -29,11 +30,16 @@ BuildRequires:  npm(step)
 %setup -q -n node-sqlite3-%{commit}
 %patch0 -p1
 %patch1 -p1
+%nodejs_fixdep -r nan
+%nodejs_fixdep -r set-immediate
+%nodejs_fixdep --dev nan "~1.2.0"
+%nodejs_fixdep --dev set-immediate "^0.1.1"
 rm -rf deps/* node_modules
 echo "{}" > deps/common-sqlite.gypi
 
 
 %build
+%nodejs_symlink_deps --build
 export CXXFLAGS="%{optflags}"
 node-gyp configure -- -Dsqlite=/usr -Dmodule_name=node_sqlite3 -Dmodule_path=lib/binding
 node-gyp build
@@ -58,6 +64,9 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 500000
 
 
 %changelog
+* Wed Jul 16 2014 Tom Hughes <tom at compton.nu> - 2.2.4-1
+- Update to 2.2.4 upstream release
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 7785821..969f42c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47630b1d04d8863b7331760e70960cf2  node-sqlite3-b3cbf17df6b0a1b4384e10e900f658c04bb73f44.tar.gz
+cd6ab93140d844ed57eb5bde2db64305  node-sqlite3-9a6a197d1177939003282c58378f51192fd67c1a.tar.gz