[wt] got rid of bundled sqlite3 libraries

[Michal Minar]

commit 89d263cc015df00c2e1b4287b63e5a2a256e1a5e
Author: Michal Minar <miminar at redhat.com>
Date:   Fri Mar 21 10:47:24 2014 +0100

    got rid of bundled sqlite3 libraries
    
    Although option USE_SYSTEM_SQLITE3 is on, bundled sqlite3 library got
    compiled and linked with shipped dbo backend library. Added patch fixing
    this issue.
    
    Resolves: bz#1077919

 use-system-sqlite.patch |   18 ++++++++++++++++++
 wt.spec                 |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/use-system-sqlite.patch b/use-system-sqlite.patch
new file mode 100644
index 0000000..ec29ff0
--- /dev/null
+++ b/use-system-sqlite.patch
@@ -0,0 +1,18 @@
+Index: wt-3.3.2/src/CMakeLists.txt
+===================================================================
+--- wt-3.3.2.orig/src/CMakeLists.txt
++++ wt-3.3.2/src/CMakeLists.txt
+@@ -5,9 +5,12 @@ INCLUDE_DIRECTORIES(
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR} # for WConfig.h
+   ${BOOST_INCLUDE_DIRS}
+-  Wt/Dbo/backend/amalgamation # for sqlite3.h
+ )
+ 
++IF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3)
++  INCLUDE_DIRECTORIES(Wt/Dbo/backend/amalgamation) # sqlite 3
++ENDIF(ENABLE_SQLITE AND NOT USE_SYSTEM_SQLITE3)
++
+ LINK_DIRECTORIES(${BOOST_LIB_DIRS})
+ 
+ MACRO (FILE_TO_STRING infile outfile var)
diff --git a/wt.spec b/wt.spec
index 141beb1..8d223fc 100644
--- a/wt.spec
+++ b/wt.spec
@@ -6,7 +6,7 @@
 
 Name:           wt
 Version:        3.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for developing web applications
 
 Group:          Development/Libraries
@@ -30,6 +30,7 @@ Source3:        README.fedora
 Source4:        wt-generate-tarball.sh
 Patch0:         find-mysql.patch
 Patch1:         install-mysql.patch
+Patch2:         use-system-sqlite.patch
 
 BuildRequires:  cmake >= 2.6 boost-devel%{_isa} >= 1.41 openssl-devel
 BuildRequires:  GraphicsMagick-devel pango-devel sqlite-devel postgresql-devel
@@ -102,6 +103,7 @@ This package contains the documents for Wt API and examples.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .find-mysql
 %patch1 -p1 -b .install-mysql
+%patch2 -p1 -b .use-system-sqlite
 
 # static files like javascript and css should not be executable
 for d in src resources examples; do
@@ -277,6 +279,9 @@ popd
 %{_defaultdocdir}/%{name}-doc/examples/*
 
 %changelog
+* Fri Mar 21 2014 Michal Minar <miminar at redhat.com> 3.3.2-2
+- Got rid of bundled sqlite libraries.
+
 * Fri Mar 14 2014 Michal Minar <miminar at redhat.com> 3.3.2-1
 - Update to 3.3.2