diff --git a/.gitignore b/.gitignore index 750cd48..ff5b724 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /akonadi-1.4.1.tar.bz2 +/akonadi-1.4.3.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 deleted file mode 100644 index 2a14a7e..0000000 --- a/akonadi-server-1.4.0-remove-sqlite-version-assert.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 3de8093..978dfe3 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -5,8 +5,8 @@ Summary: PIM Storage Service Name: akonadi -Version: 1.4.1 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2+ @@ -25,7 +25,6 @@ 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/ @@ -77,8 +76,6 @@ 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} @@ -104,8 +101,10 @@ mkdir -p %{buildroot}%{_libdir}/akonadi %check -# one expected failure in mock, -# 4/7 Test #4: akonadi-imapstreamparsertest ......***Exception: SegFault 0.01 sec +## expected failures: +#The following tests FAILED: +# 2 - akonadi-imapparserbenchmark (Failed) +# 3 - akonadidb-xmllint (Failed) make test -C %{_target_platform} ||: export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig test "$(pkg-config --modversion akonadi)" = "%{version}" @@ -157,6 +156,9 @@ fi %changelog +* Fri Jan 07 2011 1.4.3-1 +- akonadi-1.4.3 + * Fri Oct 22 2010 Rex Dieter 1.4.1-2 - patch out (paranoid) assert diff --git a/sources b/sources index d184e6e..5db30ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0852fd5f45aa602b09824cf51e24fbd akonadi-1.4.1.tar.bz2 +ffe61aca65dffded578bd6fae8aba6bd akonadi-1.4.3.tar.bz2