[akonadi/f14/master] - akonadi-1.4.3

Rex Dieter rdieter at fedoraproject.org
Fri Jan 7 13:49:04 UTC 2011


commit c6e03588d1bbb017529c6d6dc1742de3202770ca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 7 07:48:24 2011 -0600

    - akonadi-1.4.3

 .gitignore                                         |    1 +
 ...server-1.4.0-remove-sqlite-version-assert.patch |   11 -----------
 akonadi.spec                                       |   16 +++++++++-------
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 19 deletions(-)
---
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.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 <rdieter at fedoraproject.org> 1.4.3-1
+- akonadi-1.4.3
+
 * Fri Oct 22 2010 Rex Dieter <rdieter at fedoraproject.org> 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


More information about the scm-commits mailing list