[nodejs-sqlite3] Update to 2.2.0 upstream release

Tom Hughes tomh at fedoraproject.org
Tue Jan 14 19:24:40 UTC 2014


commit 119126cceceee408c4af704e6369a290546bbc07
Author: Tom Hughes <tom at compton.nu>
Date:   Tue Jan 14 19:11:47 2014 +0000

    Update to 2.2.0 upstream release

 .gitignore                  |    1 +
 nodejs-sqlite3-binary.patch |   90 -------------------------------------------
 nodejs-sqlite3-rpath.patch  |   20 +++++++++
 nodejs-sqlite3.spec         |   18 +++------
 sources                     |    2 +-
 5 files changed, 28 insertions(+), 103 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3721997..6c5abc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /sqlite3-2.1.17.tgz
 /sqlite3-2.1.18.tgz
 /sqlite3-2.1.19.tgz
+/sqlite3-2.2.0.tgz
diff --git a/nodejs-sqlite3-rpath.patch b/nodejs-sqlite3-rpath.patch
new file mode 100644
index 0000000..b1956e8
--- /dev/null
+++ b/nodejs-sqlite3-rpath.patch
@@ -0,0 +1,20 @@
+commit 6ad2e8a5b9a924140d4ee8b6eb733d9c66195f78
+Author: Tom Hughes <tom at compton.nu>
+Date:   Tue Jan 14 19:21:02 2014 +0000
+
+    Don't set rpath
+
+diff --git a/binding.gyp b/binding.gyp
+index 6d5babb..273f6a5 100644
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -14,8 +14,7 @@
+                "-L<@(sqlite)/lib",
+                "-lsqlite3"
+             ],
+-            "include_dirs": [ "<@(sqlite)/include" ],
+-            "conditions": [ [ "OS=='linux'", {"libraries+":["-Wl,-rpath=<@(sqlite)/lib"]} ] ]
++            "include_dirs": [ "<@(sqlite)/include" ]
+         },
+         {
+             "dependencies": [
diff --git a/nodejs-sqlite3.spec b/nodejs-sqlite3.spec
index c8a556d..319c60a 100644
--- a/nodejs-sqlite3.spec
+++ b/nodejs-sqlite3.spec
@@ -1,24 +1,20 @@
-%global enable_tests 1
-
 Name:           nodejs-sqlite3
-Version:        2.1.19
+Version:        2.2.0
 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
-Patch0:         nodejs-sqlite3-binary.patch
+Patch0:         nodejs-sqlite3-rpath.patch
 ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
 BuildRequires:  node-gyp
 BuildRequires:  sqlite-devel
 
-%if 0%{?enable_tests}
 BuildRequires:  npm(mocha)
 BuildRequires:  npm(step)
-%endif
 
 %{?nodejs_default_filter}
 
@@ -29,8 +25,7 @@ BuildRequires:  npm(step)
 %prep
 %setup -q -n package
 %patch0 -p1
-%nodejs_fixdep -r mkdirp
-%nodejs_fixdep -r tar.gz
+rm lib/binary_name.js
 rm -rf deps/* node_modules
 echo "{}" > deps/common-sqlite.gypi
 
@@ -44,18 +39,14 @@ node-gyp build
 %install
 mkdir -p %{buildroot}/%{nodejs_sitearch}/sqlite3
 cp -pr package.json lib %{buildroot}/%{nodejs_sitearch}/sqlite3
-cp -pr build/Release/node_sqlite3.node %{buildroot}/%{nodejs_sitearch}/sqlite3/lib
 %nodejs_symlink_deps
 
 
-%if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
-ln -s ../build/Release/node_sqlite3.node lib
 %{__nodejs} test/support/createdb.js
 mkdir test/tmp
 NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 500000
-%endif
 
 
 %files
@@ -64,6 +55,9 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec -t 500000
 
 
 %changelog
+* Tue Jan 14 2014 Tom Hughes <tom at compton.nu> - 2.2.0-1
+- Update to 2.2.0 upstream release
+
 * Sun Nov  3 2013 Tom Hughes <tom at compton.nu> - 2.1.19-1
 - Update to 2.1.19 upstream release
 
diff --git a/sources b/sources
index 2905cea..c897efd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba3767c1f39d066d580cdc90c7235f01  sqlite3-2.1.19.tgz
+737b90895e1e314a2c013ca47304058f  sqlite3-2.2.0.tgz


More information about the scm-commits mailing list