[nodejs-sqlite3] Update to 2.1.9 upstream release

[Tom Hughes]

commit b83e4e7189c93405b94a01404a7dcb25ff1a3dca
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Jun 13 22:22:44 2013 +0100

    Update to 2.1.9 upstream release

 .gitignore                     |    1 +
 nodejs-sqlite3-async.patch     |   34 -----------------
 nodejs-sqlite3-callbacks.patch |   43 ---------------------
 nodejs-sqlite3-deps.patch      |   43 +++++++++++++++++++++
 nodejs-sqlite3-libraries.patch |   13 ------
 nodejs-sqlite3-paths.patch     |    8 ----
 nodejs-sqlite3-tests.patch     |   80 ----------------------------------------
 nodejs-sqlite3.spec            |   34 ++++++----------
 sources                        |    2 +-
 9 files changed, 58 insertions(+), 200 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0493940..2d713fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sqlite3-2.1.5.tgz
 /sqlite3-2.1.7.tgz
+/sqlite3-2.1.9.tgz
diff --git a/nodejs-sqlite3-deps.patch b/nodejs-sqlite3-deps.patch
new file mode 100644
index 0000000..c46cf62
--- /dev/null
+++ b/nodejs-sqlite3-deps.patch
@@ -0,0 +1,43 @@
+commit ab20ce7084462cadd8e7e4f6be23f973f48aba35
+Author: Tom Hughes <tom at compton.nu>
+Date:   Fri Jun 14 01:03:28 2013 +0100
+
+    Don't bother unpacking sqlite if we're not using it
+
+diff --git a/binding.gyp b/binding.gyp
+index ca9f187..c3336d1 100644
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -20,17 +20,21 @@
+     {
+       'target_name': 'action_before_build',
+       'type': 'none',
+-      'actions': [
+-        {
+-          'action_name': 'unpack_sqlite_dep',
+-          'inputs': [
+-            './deps/sqlite-autoconf-<@(sqlite_version).tar.gz'
+-          ],
+-          'outputs': [
+-            './deps/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
+-          ],
+-          'action': ['<@(bin_name)','./node_modules/.bin/targz','deps/sqlite-autoconf-<@(sqlite_version).tar.gz','-x','deps/']
+-        }
++      'conditions': [
++        ['sqlite == "internal"', {
++          'actions': [
++            {
++              'action_name': 'unpack_sqlite_dep',
++              'inputs': [
++                './deps/sqlite-autoconf-<@(sqlite_version).tar.gz'
++              ],
++              'outputs': [
++                './deps/sqlite-autoconf-<@(sqlite_version)/sqlite3.c'
++              ],
++              'action': ['<@(bin_name)','./node_modules/.bin/targz','deps/sqlite-autoconf-<@(sqlite_version).tar.gz','-x','deps/']
++            }
++          ]
++        }]
+       ]
+     },
+     {
diff --git a/nodejs-sqlite3.spec b/nodejs-sqlite3.spec
index f97722c..d376bc0 100644
--- a/nodejs-sqlite3.spec
+++ b/nodejs-sqlite3.spec
@@ -1,23 +1,15 @@
 %global enable_tests 1
 
 Name:           nodejs-sqlite3
-Version:        2.1.7
+Version:        2.1.9
 Release:        1%{?dist}
 Summary:        Asynchronous, non-blocking SQLite3 bindings for Node.js
 
 License:        BSD
 URL:            https://github.com/developmentseed/node-sqlite3
 Source0:        http://registry.npmjs.org/sqlite3/-/sqlite3-%{version}.tgz
-# Link against system libraries
-Patch0:         nodejs-sqlite3-libraries.patch
-# Fix path for binary object to match packaging guidelines
-Patch1:         nodejs-sqlite3-paths.patch
-# Offered upstream - https://github.com/developmentseed/node-sqlite3/pull/117
-Patch2:         nodejs-sqlite3-async.patch
-# Offered upstream - https://github.com/developmentseed/node-sqlite3/pull/121
-Patch3:         nodejs-sqlite3-callbacks.patch
-# Offered upstream - https://github.com/developmentseed/node-sqlite3/pull/132
-Patch4:         nodejs-sqlite3-tests.patch
+# Offered upstream - https://github.com/developmentseed/node-sqlite3/pull/147
+Patch0:         nodejs-sqlite3-deps.patch
 
 ExclusiveArch:  %{ix86} x86_64 %{arm}
 
@@ -38,31 +30,27 @@ BuildRequires:  npm(step)
 
 %prep
 %setup -q -n package
-%patch0 -p0 -b .libraries
-%patch1 -p0
-%patch2 -p1 -b .async
-%patch3 -p1 -b .callbacks
-%patch4 -p1 -b .tests
-rm -rf deps node_modules
+%patch0 -p1
+%nodejs_fixdep -r tar.gz
+rm -rf deps/* node_modules
+echo "{}" > deps/common-sqlite.gypi
 
 
 %build
 export CXXFLAGS="%{optflags}"
-node-gyp rebuild
+node-gyp configure -- -Dsqlite=/usr
+node-gyp build
 
 
 %install
 mkdir -p %{buildroot}/%{nodejs_sitearch}/sqlite3
 cp -pr package.json lib %{buildroot}/%{nodejs_sitearch}/sqlite3
-mkdir -p %{buildroot}/%{nodejs_sitearch}/sqlite3/build
-install -p -D -m0755 build/Release/node_sqlite3.node %{buildroot}%{nodejs_sitearch}/sqlite3/build
 %nodejs_symlink_deps
 
 
 %if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
-ln -s Release/node_sqlite3.node build/node_sqlite3.node
 %{__nodejs} test/support/createdb.js
 mkdir test/tmp
 NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 120000
@@ -75,6 +63,10 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 120000
 
 
 %changelog
+* Thu Jun 13 2013 Tom Hughes <tom at compton.nu> - 2.1.9-1
+- Update to 2.1.9 upstream release
+- Drop patches which have been merged upstream
+
 * Thu Mar 21 2013 Tom Hughes <tom at compton.nu> - 2.1.7-1
 - Update to 2.1.7 upstream release
 - Switch to running tests using mocha
diff --git a/sources b/sources
index 7100fcb..a7cc182 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5625fbba4306656c32ab27ac3148e9f5  sqlite3-2.1.7.tgz
+2c326aa415aa452267f4a5a1c045802c  sqlite3-2.1.9.tgz