From 1a638be657bab2d787b0d31788f84ff6aa678fe2 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Feb 10 2010 00:58:28 +0000
Subject: Sync from devel:

Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> 1.3.1-1
- akonadi-1.3.1
Wed Jan 20 2010 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-1
- akonadi-1.3.0
Tue Jan 19 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-3
- Client applications freeze because of hanging Nepomuk search job
    (kde#219687)
Sat Jan 16 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-2
- rebuild (boost)
Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-1
- akonadi-1.2.90
Mon Dec 07 2009 Rex Dieter <rdieter@fedoraproject.org> 1.2.80-1
- Akonadi 1.2.80
- restore mysql deps
Sat Nov 21 2009 Ben Boeckel <MathStuf@gmail.com> - 1.2.61-0.1.svn1052261
- Update to SVN snapshot of 1.2.61

---

diff --git a/.cvsignore b/.cvsignore
index 21dd6d7..4fde055 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-akonadi-1.2.1.tar.bz2
+akonadi-1.3.1.tar.bz2
diff --git a/akonadi.spec b/akonadi.spec
index 762d9d7..1c6befd 100644
--- a/akonadi.spec
+++ b/akonadi.spec
@@ -1,12 +1,13 @@
 
 Summary: PIM Storage Service
 Name:    akonadi
-Version: 1.2.1
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://download.akonadi-project.org/
+# Official release
 Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,7 +53,7 @@ Requires: pkgconfig
 
 
 %prep
-%setup -q 
+%setup -q -n akonadi-%{version}%{?alphatag}
 
 %patch1 -p1 -b .mysql_conf
 touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
@@ -119,8 +120,27 @@ fi
 
 
 %changelog
-* Mon Dec 07 2009 Rex Dieter <rdieter@fedoraproject.org> 1.2.1-2
-- restore mysql-related dependencies
+* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> 1.3.1-1
+- akonadi-1.3.1
+
+* Wed Jan 20 2010 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-1
+- akonadi-1.3.0
+
+* Tue Jan 19 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-3
+- Client applications freeze because of hanging Nepomuk search job (kde#219687)
+
+* Sat Jan 16 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-2
+- rebuild (boost)
+
+* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> 1.2.90-1
+- akonadi-1.2.90
+
+* Mon Dec 07 2009 Rex Dieter <rdieter@fedoraproject.org> 1.2.80-1
+- Akonadi 1.2.80
+- restore mysql deps
+
+* Sat Nov 21 2009 Ben Boeckel <MathStuf@gmail.com> - 1.2.61-0.1.svn1052261
+- Update to SVN snapshot of 1.2.61
 
 * Tue Sep  1 2009 Lukáš Tinkl <ltinkl@redhat.com> - 1.2.1-1
 - Akonadi 1.2.1
diff --git a/sources b/sources
index 37af0bd..1ef5f49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9c1d000844f31c67360078ddf60bec2  akonadi-1.2.1.tar.bz2
+e6eef3ed5c28d55f4b6530544e379413  akonadi-1.3.1.tar.bz2