From 6a8a35707ec33630d29298df5041f4b9933664f5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jan 11 2011 20:45:21 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/akonadi


---

diff --git a/.gitignore b/.gitignore
index 13cb2f1..726859f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/akonadi-1.4.80.tar.bz2
+/akonadi-1.4.90.tar.bz2
+/akonadi-1.4.95.tar.bz2
diff --git a/akonadi.spec b/akonadi.spec
index 3491064..7ad31e8 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,7 +1,7 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.4.80
+Version: 1.4.95
 Release: 1%{?dist}
 
 Group:   System Environment/Libraries
@@ -17,7 +17,7 @@ Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define mysql_conf_timestamp 20101120
+%define mysql_conf_timestamp 20110107
 # shrink default initial db size a bit (approx 140mb->28mb)
 Patch1: akonadi-mysql_conf.patch
 
@@ -91,9 +91,7 @@ mkdir -p %{buildroot}%{_libdir}/akonadi
 
 
 %check
-# one expected failure in mock,
-# 4/7 Test #4: akonadi-imapstreamparsertest ......***Exception: SegFault  0.01 sec
-make test -C %{_target_platform} ||:
+make test -C %{_target_platform}
 export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
 test "$(pkg-config --modversion akonadi)" = "%{version}"
 
@@ -144,7 +142,17 @@ fi
 
 
 %changelog
-* Sun Nov 21 2010 Rex Dieter <rdieter@fedoraproject.org> -  1.4.80-1
+* Fri Jan 07 2011 Rex Dieter <rdieter@fedoraproject.org> 1.4.95-1
+- akonadi-1.4.95
+
+* Fri Jan 07 2011 <rdieter@fedoraproject.org> - 1.4.90-2
+- rebuild (mysql)
+- %%check: make test should pass 100% now
+
+* Tue Dec 21 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.4.90-1
+- akonadi-1.4.90
+
+* Sun Nov 21 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.4.80-1
 - akonadi-1.4.80
 
 * Sat Nov 20 2010 Rex Dieter <rdieter@fedoraproject.org> 1.4.54-1.20101120
diff --git a/sources b/sources
index c7ec78d..b5008c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-925c20972c3a3e042bd9a638d90cc1ee  akonadi-1.4.80.tar.bz2
+7eba7b6725e306e7e8cce4a8f77e6ac5  akonadi-1.4.95.tar.bz2