From 9e73b46c905f6420200b2feef69958d35a53a70d606634673dbfe27171c9a0ee Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 25 Jul 2011 22:08:30 +0000
Subject: [PATCH] Accepting request 76864 from
 home:vuntz:branches:GNOME:Factory

Update to 3.1.4

OBS-URL: https://build.opensuse.org/request/show/76864
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=127
---
 evolution-3.1.3.tar.bz2 |  3 ---
 evolution-3.1.4.tar.bz2 |  3 +++
 evolution.changes       | 16 ++++++++++++++++
 evolution.spec          |  6 +++---
 4 files changed, 22 insertions(+), 6 deletions(-)
 delete mode 100644 evolution-3.1.3.tar.bz2
 create mode 100644 evolution-3.1.4.tar.bz2

diff --git a/evolution-3.1.3.tar.bz2 b/evolution-3.1.3.tar.bz2
deleted file mode 100644
index 824988a..0000000
--- a/evolution-3.1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd7a0eb8e73056a435f8eae1006138ee28781147879331bcef3afe5de1bcca57
-size 31802080
diff --git a/evolution-3.1.4.tar.bz2 b/evolution-3.1.4.tar.bz2
new file mode 100644
index 0000000..0021115
--- /dev/null
+++ b/evolution-3.1.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e88b108a7c1e92f6b2bbbc652f0eb27de2064b9a90cea4946434d217fc660dcb
+size 31944451
diff --git a/evolution.changes b/evolution.changes
index 79f56e8..b8e6bba 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Jul 24 12:11:17 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.4:
+  + Adapt to Camel API changes.
+  + Convert junk filtering EPlugins to EExtensions.
+  + network-manager:
+    - Recover from dropped D-Bus connections faster
+    - Keep network availablility state accurate.
+  + online-accounts: Give Google calendars a color.
+  + Various other code changes.
+  + Bug Fixes:
+    - bgo#653699: Improve mail notifications
+    - bgo#652629, bgo#652634, bgo#653568.
+  + Updated translations.
+
 -------------------------------------------------------------------
 Mon Jul  4 12:48:22 CEST 2011 - vuntz@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 9545033..8e4fc18 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -75,7 +75,7 @@ License:        LGPLv2.0 ; LGPLv3
 Group:          Productivity/Networking/Email/Clients
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
 %define evolution_base_version 3.2
-Version:        3.1.3
+Version:        3.1.4
 Release:        1
 # FIXME: check with upstream/meego if we want to enable clutter for express mode
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
@@ -268,6 +268,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/*.so.*
 %dir %{_libdir}/evolution/*/modules/
 %{_libdir}/evolution/*/modules/*-module-addressbook.*
+%{_libdir}/evolution/*/modules/*-module-bogofilter.*
 %{_libdir}/evolution/*/modules/*-module-calendar.*
 %{_libdir}/evolution/*/modules/*-module-composer-autosave.*
 %{_libdir}/evolution/*/modules/*-module-mail.*
@@ -277,11 +278,11 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/modules/*-module-online-accounts.*
 %{_libdir}/evolution/*/modules/*-module-plugin-lib.*
 %{_libdir}/evolution/*/modules/*-module-plugin-manager.*
+%{_libdir}/evolution/*/modules/*-module-spamassassin.*
 %{_libdir}/evolution/*/modules/*-module-startup-wizard.*
 %dir %{_libdir}/evolution/*/plugins
 %{_libdir}/evolution/*/plugins/*-addressbook-file.*
 %{_libdir}/evolution/*/plugins/*-backup-restore.*
-%{_libdir}/evolution/*/plugins/*-bogo-junk-plugin.*
 %{_libdir}/evolution/*/plugins/*-calendar-file.*
 %{_libdir}/evolution/*/plugins/*-calendar-http.*
 %{_libdir}/evolution/*/plugins/*-calendar-weather.*
@@ -308,7 +309,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/plugins/*-prefer-plain.*
 %{_libdir}/evolution/*/plugins/*-pst-import.*
 %{_libdir}/evolution/*/plugins/*-publish-calendar.*
-%{_libdir}/evolution/*/plugins/*-sa-junk-plugin.*
 %{_libdir}/evolution/*/plugins/*-save-calendar.*
 %{_libdir}/evolution/*/plugins/*-templates.*
 %dir %{_libexecdir}/evolution