From 242fd6cb449fb62c41278c5e67aa1ef4252603f4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Nov 06 2010 18:50:51 +0000
Subject: Merge remote branch 'origin/master' into f13/master


---

diff --git a/.gitignore b/.gitignore
index 768bfb4..750cd48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-akonadi-1.4.0.tar.bz2
+/akonadi-1.4.1.tar.bz2
diff --git a/akonadi-server-1.4.0-remove-sqlite-version-assert.patch b/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
new file mode 100644
index 0000000..2a14a7e
--- /dev/null
+++ b/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
@@ -0,0 +1,11 @@
+diff -ru ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp ./qsqlite/src/qsql_sqlite.cpp
+--- ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp	2010-07-31 18:12:24.000000000 +0200
++++ ./qsqlite/src/qsql_sqlite.cpp	2010-09-08 15:23:16.152896580 +0200
+@@ -323,7 +323,6 @@
+ 
+     setSelect(false);
+ 
+-    Q_ASSERT(SQLITE_VERSION_NUMBER == 3006023);
+ #if (SQLITE_VERSION_NUMBER >= 3003011)
+ //    int res = sqlite3_prepare16_v2(d->access, query.constData(), (query.size() + 1) * sizeof(QChar),
+ //                                   &d->stmt, 0);
diff --git a/akonadi.spec b/akonadi.spec
index 75947ba..3de8093 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -5,8 +5,8 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.4.0
-Release: 3%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -25,6 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: akonadi-mysql_conf.patch
 
 ## upstream patches
+Patch100: akonadi-server-1.4.0-remove-sqlite-version-assert.patch
 
 ## backport from trunk/
 
@@ -76,6 +77,8 @@ Requires: pkgconfig
 %endif
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
+%patch100 -p1 -b .remove-sqlite-version-assert
+
 
 %build
 mkdir -p %{_target_platform}
@@ -154,6 +157,12 @@ fi
 
 
 %changelog
+* Fri Oct 22 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.1-2
+- patch out (paranoid) assert
+
+* Fri Oct 22 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.1-1
+- akonadi-1.4.1
+
 * Tue Oct 19 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-3
 - own %%_libdir/akonadi (#644540)
 
diff --git a/sources b/sources
index cec6901..d184e6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed19efb982f7debd7e109cf1397d0588  akonadi-1.4.0.tar.bz2
+c0852fd5f45aa602b09824cf51e24fbd  akonadi-1.4.1.tar.bz2