[nss-softokn] Allow building nss-softokn against older system sqlite

[Elio Maldonado]

commit 853379332feebac38c048ee3f567828e0512086e
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Feb 4 13:13:35 2013 -0800

    Allow building nss-softokn against older system sqlite

 ...building-nss-softokn-against-older-sqlite.patch |   20 ++++++++++++++++++++
 nss-softokn.spec                                   |    9 +++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/allow-building-nss-softokn-against-older-sqlite.patch b/allow-building-nss-softokn-against-older-sqlite.patch
new file mode 100644
index 0000000..627edfb
--- /dev/null
+++ b/allow-building-nss-softokn-against-older-sqlite.patch
@@ -0,0 +1,20 @@
+Index: ./mozilla/security/nss/lib/softoken/sdb.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/softoken/sdb.c,v
+retrieving revision 1.30
+retrieving revision 1.31
+diff -u -p -r1.30 -r1.31
+--- ./mozilla/security/nss/lib/softoken/sdb.c	16 Jan 2013 18:13:25 -0000	1.30
++++ ./mozilla/security/nss/lib/softoken/sdb.c	4 Feb 2013 19:58:20 -0000	1.31
+@@ -254,6 +254,11 @@ sdb_getFallbackTempDir(void)
+ #error "sdb_getFallbackTempDir not implemented"
+ #endif
+ 
++#ifndef SQLITE_FCNTL_TEMPFILENAME
++/* SQLITE_FCNTL_TEMPFILENAME was added in SQLite 3.7.15 */
++#define SQLITE_FCNTL_TEMPFILENAME 16
++#endif
++
+ static char *
+ sdb_getTempDir(sqlite3 *sqlDB)
+ {
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 2b9c8eb..453fdf5 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -25,7 +25,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.14.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -75,7 +75,8 @@ Patch8:           softoken-minimal-test-dependencies.patch
 # NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers. 
 # Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
 Patch9:           iquote.patch
-
+# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=837799
+Patch10:  allow-building-nss-softokn-against-older-sqlite.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -130,6 +131,7 @@ Header and library files for doing development with Network Security Services.
 %patch8 -p0 -b .crypto
 # activate if needed when doing a major update with new apis
 %patch9 -p0 -b .iquote
+%patch10 -p0 -b .oldersqlite
 
 
 %build
@@ -383,6 +385,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Mon Feb 04 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-3
+- Allow building nss-softokn against older system sqlite
+
 * Sat Feb 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-2
 - Update to NSS_3_14_2_RTM
 - Restore comments on how to transition when signing algorithm changes