From 74a88366ce666166e2a31821a27e4d6361c73f29 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 23 Aug 2013 18:15:57 +0200
Subject: [PATCH 01/18] Split developer documentation into evolution-devel-docs
 subpackage

---
 evolution.spec | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d911425..551e70e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.9.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -139,6 +139,16 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version}
 %description devel
 Development files needed for building things which link against %{name}.
 
+%package devel-docs
+Summary: Developer documentation for Evolution
+Group: Development/Libraries
+Requires: devhelp
+Requires: evolution-devel = %{version}-%{release}
+BuildArch: noarch
+
+%description devel-docs
+This package contains developer documentation for Evolution.
+
 %package help
 Group: Applications/Productivity
 Summary: Help files for %{name}
@@ -483,10 +493,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
-%{_datadir}/gtk-doc/html/evolution-mail-composer
-%{_datadir}/gtk-doc/html/evolution-mail-formatter
-%{_datadir}/gtk-doc/html/evolution-shell
-%{_datadir}/gtk-doc/html/evolution-util
 %{_includedir}/evolution-%{evo_base_version}
 %{_libdir}/pkgconfig/evolution-calendar-3.0.pc
 %{_libdir}/pkgconfig/evolution-mail-3.0.pc
@@ -494,6 +500,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 
+%files devel-docs
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/evolution-mail-composer
+%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter
+%doc %{_datadir}/gtk-doc/html/evolution-shell
+%doc %{_datadir}/gtk-doc/html/evolution-util
+
 %files help -f help.lang
 %defattr(-, root, root)
 %dir %{_datadir}/help/*/evolution
@@ -518,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Aug 23 2013 Milan Crha <mcrha@redhat.com> - 3.9.90-2
+- Split developer documentation into evolution-devel-docs subpackage
+
 * Mon Aug 19 2013 Milan Crha <mcrha@redhat.com> - 3.9.90-1
 - Update to 3.9.90
 

From f9fa7a55fae943455e55ca91ea5f02969b821782 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 2 Sep 2013 08:58:28 +0200
Subject: [PATCH 02/18] Update to 3.9.91

---
 .gitignore     | 1 +
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 357cd5b..0357a0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.4.tar.xz
 /evolution-3.9.5.tar.xz
 /evolution-3.9.90.tar.xz
+/evolution-3.9.91.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 551e70e..0a7854b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,8 +30,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.9.90
-Release: 2%{?dist}
+Version: 3.9.91
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 02 2013 Milan Crha <mcrha@redhat.com> - 3.9.91-1
+- Update to 3.9.91
+
 * Fri Aug 23 2013 Milan Crha <mcrha@redhat.com> - 3.9.90-2
 - Split developer documentation into evolution-devel-docs subpackage
 
diff --git a/sources b/sources
index e559d1d..b307c1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1152520aff50ce70a8f463a05e5de11b  evolution-3.9.90.tar.xz
+1c18eedf725fa62a3cd93593f8f022b1  evolution-3.9.91.tar.xz

From 769842dadfdb85fbe5118914e3e9819e14a7457c Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Tue, 3 Sep 2013 22:43:00 +0200
Subject: [PATCH 03/18] Rebuilt for libgnome-desktop soname bump

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 0a7854b..cb5f782 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.9.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Sep 03 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.91-2
+- Rebuilt for libgnome-desktop soname bump
+
 * Mon Sep 02 2013 Milan Crha <mcrha@redhat.com> - 3.9.91-1
 - Update to 3.9.91
 

From 03539d1e51a9cdcebe407cc7c296faf1788f4de1 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 16 Sep 2013 08:26:11 +0200
Subject: [PATCH 04/18] Update to 3.9.92

---
 .gitignore     | 1 +
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0357a0b..6f95a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.5.tar.xz
 /evolution-3.9.90.tar.xz
 /evolution-3.9.91.tar.xz
+/evolution-3.9.92.tar.xz
diff --git a/evolution.spec b/evolution.spec
index cb5f782..151f433 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,8 +30,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.9.91
-Release: 2%{?dist}
+Version: 3.9.92
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 16 2013 Milan Crha <mcrha@redhat.com> - 3.9.92-1
+- Update to 3.9.92
+
 * Tue Sep 03 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.91-2
 - Rebuilt for libgnome-desktop soname bump
 
diff --git a/sources b/sources
index b307c1b..48c4b12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c18eedf725fa62a3cd93593f8f022b1  evolution-3.9.91.tar.xz
+c25767ad5468f2f5de300ffd7503d7f7  evolution-3.9.92.tar.xz

From 11c8fef4c227e74681c4fc158382b3489db6f612 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 16 Sep 2013 10:27:19 +0200
Subject: [PATCH 05/18] Package evolution.appdata.xml file too

---
 evolution.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evolution.spec b/evolution.spec
index 151f433..ce12b5b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -357,6 +357,8 @@ rm -rf $RPM_BUILD_ROOT
 # The main executable
 %{_bindir}/evolution
 
+%{_datadir}/appdata/evolution.appdata.xml
+
 # Desktop files:
 %{_datadir}/applications/evolution.desktop
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop

From 22b40e832c41b892b484cefb46004b0b0786f2f2 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 23 Sep 2013 11:22:19 +0200
Subject: [PATCH 06/18] Update to 3.10.0; Remove explicit Requires on libpst in
 pst subpackage

---
 .gitignore     | 1 +
 evolution.spec | 9 ++++++---
 sources        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f95a64..124af6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.90.tar.xz
 /evolution-3.9.91.tar.xz
 /evolution-3.9.92.tar.xz
+/evolution-3.10.0.tar.xz
diff --git a/evolution.spec b/evolution.spec
index ce12b5b..9f920f3 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,14 +30,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.9.92
+Version: 3.10.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -192,7 +192,6 @@ This package contains supplemental utilities for %{name} that require Perl.
 Group: Applications/Productivity
 Summary: PST importer plugin for Evolution
 Requires: %{name} = %{version}-%{release}
-Requires: libpst
 
 %description pst
 This package contains the plugin to import Microsoft Personal Storage Table
@@ -533,6 +532,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 23 2013 Milan Crha <mcrha@redhat.com> - 3.10.0-1
+- Update to 3.10.0
+- Remove explicit Requires on libpst in pst subpackage
+
 * Mon Sep 16 2013 Milan Crha <mcrha@redhat.com> - 3.9.92-1
 - Update to 3.9.92
 
diff --git a/sources b/sources
index 48c4b12..4fd31eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c25767ad5468f2f5de300ffd7503d7f7  evolution-3.9.92.tar.xz
+01c3f4f73bc236b95f74afedf9f463ca  evolution-3.10.0.tar.xz

From 641ea8c59cf53213ebf45161e449fa9558414d7b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 14 Oct 2013 10:18:08 +0200
Subject: [PATCH 07/18] - Update to 3.10.1 - Remove the dependency on libytnef,
 which apparently isn't needed for   the PST importer and disable the
 experimental TNEF attachments plugin - Avoid help launch with F1 when
 evolution-help is not installed

---
 .gitignore                           |  1 +
 evolution-2.30.1-help-contents.patch | 12 +++++++-----
 evolution.spec                       | 10 +++++++---
 sources                              |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 124af6c..7b80690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.91.tar.xz
 /evolution-3.9.92.tar.xz
 /evolution-3.10.0.tar.xz
+/evolution-3.10.1.tar.xz
diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch
index e0b27af..650e6de 100644
--- a/evolution-2.30.1-help-contents.patch
+++ b/evolution-2.30.1-help-contents.patch
@@ -1,7 +1,7 @@
-diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution-3.9.1/shell/e-shell-window-actions.c
---- evolution-3.9.1/shell/e-shell-window-actions.c.help-contents	2013-04-29 11:23:28.943063568 +0200
-+++ evolution-3.9.1/shell/e-shell-window-actions.c	2013-04-29 11:24:16.701599684 +0200
-@@ -1396,6 +1396,15 @@ e_shell_window_actions_init (EShellWindo
+diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c
+--- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents	2013-09-07 18:34:59.000000000 +0200
++++ evolution-3.10.0/shell/e-shell-window-actions.c	2013-10-10 08:51:03.863987108 +0200
+@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo
  	if (path == NULL)
  		gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
  	g_free (path);
@@ -11,8 +11,10 @@ diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution-
 +	path = g_build_filename (
 +		EVOLUTION_DATADIR, "help", "C",
 +		PACKAGE, "index.page", NULL);
-+	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
 +		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++		gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
++	}
 +	g_free (path);
  }
  
diff --git a/evolution.spec b/evolution.spec
index 9f920f3..a6ccd90 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.0
+Version: 3.10.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -114,7 +114,6 @@ BuildRequires: libnotify-devel
 
 %if %{libpst_support}
 BuildRequires: libpst-devel
-BuildRequires: libytnef-devel
 %endif
 
 %description
@@ -407,7 +406,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/modules/module-settings.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so
-%{_libdir}/evolution/%{evo_base_version}/modules/module-tnef-attachment.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so
 
@@ -532,6 +530,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 14 2013 Milan Crha <mcrha@redhat.com> - 3.10.1-1
+- Update to 3.10.1
+- Remove the dependency on libytnef, which apparently isn't needed for
+  the PST importer and disable the experimental TNEF attachments plugin
+- Avoid help launch with F1 when evolution-help is not installed
+
 * Mon Sep 23 2013 Milan Crha <mcrha@redhat.com> - 3.10.0-1
 - Update to 3.10.0
 - Remove explicit Requires on libpst in pst subpackage
diff --git a/sources b/sources
index 4fd31eb..1dfcd1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01c3f4f73bc236b95f74afedf9f463ca  evolution-3.10.0.tar.xz
+53199a7863b23d177774362d33993774  evolution-3.10.1.tar.xz

From a9e66245dffb090cb884fc6e2ff105c8d1901a39 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 11 Nov 2013 09:16:04 +0100
Subject: [PATCH 08/18] Update to 3.10.2

---
 .gitignore     | 1 +
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b80690..3969323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.92.tar.xz
 /evolution-3.10.0.tar.xz
 /evolution-3.10.1.tar.xz
+/evolution-3.10.2.tar.xz
diff --git a/evolution.spec b/evolution.spec
index a6ccd90..89bf408 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.1
+Version: 3.10.2
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Nov 11 2013 Milan Crha <mcrha@redhat.com> - 3.10.2-1
+- Update to 3.10.2
+
 * Mon Oct 14 2013 Milan Crha <mcrha@redhat.com> - 3.10.1-1
 - Update to 3.10.1
 - Remove the dependency on libytnef, which apparently isn't needed for
diff --git a/sources b/sources
index 1dfcd1c..22c923f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53199a7863b23d177774362d33993774  evolution-3.10.1.tar.xz
+4b60bba03fe5e1410ac1dde2bc61f47e  evolution-3.10.2.tar.xz

From ace236ea267610546b477a3f17dd96c55e8c2b6d Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 21 Nov 2013 19:18:45 +0100
Subject: [PATCH 09/18] Rebuild for new libical (RH bug #1023020)

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 89bf408..914287a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Nov 21 2013 Milan Crha <mcrha@redhat.com> - 3.10.2-2
+- Rebuild for new libical (RH bug #1023020)
+
 * Mon Nov 11 2013 Milan Crha <mcrha@redhat.com> - 3.10.2-1
 - Update to 3.10.2
 

From 3bf09cb29108880194b0071254d16127aa36139b Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 9 Dec 2013 10:11:16 -0500
Subject: [PATCH 10/18] 3.10.3

---
 .gitignore     | 1 +
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3969323..5f8df57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.10.0.tar.xz
 /evolution-3.10.1.tar.xz
 /evolution-3.10.2.tar.xz
+/evolution-3.10.3.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 914287a..a3a151f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,8 +30,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.2
-Release: 2%{?dist}
+Version: 3.10.3
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec 09 2013 Matthew Barnes <mbarnes@redhat.com> - 3.10.3-1
+- Update to 3.10.3
+
 * Thu Nov 21 2013 Milan Crha <mcrha@redhat.com> - 3.10.2-2
 - Rebuild for new libical (RH bug #1023020)
 
diff --git a/sources b/sources
index 22c923f..09b4b58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b60bba03fe5e1410ac1dde2bc61f47e  evolution-3.10.2.tar.xz
+bfff8537795bcfa3a67a8b0860447102  evolution-3.10.3.tar.xz

From a5f35dd361483d9c39deaa1ad9ab4a6878b41223 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 10 Feb 2014 11:43:00 +0100
Subject: [PATCH 11/18] Update to 3.10.4

---
 .gitignore     | 1 +
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f8df57..e34431b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.10.1.tar.xz
 /evolution-3.10.2.tar.xz
 /evolution-3.10.3.tar.xz
+/evolution-3.10.4.tar.xz
diff --git a/evolution.spec b/evolution.spec
index a3a151f..ee00eb2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.3
+Version: 3.10.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Feb 10 2014 Milan Crha <mcrha@redhat.com> - 3.10.4-1
+- Update to 3.10.4
+
 * Mon Dec 09 2013 Matthew Barnes <mbarnes@redhat.com> - 3.10.3-1
 - Update to 3.10.3
 
diff --git a/sources b/sources
index 09b4b58..07ea052 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfff8537795bcfa3a67a8b0860447102  evolution-3.10.3.tar.xz
+f19aea3477f72c5afa51f4b3e4a8adf5  evolution-3.10.4.tar.xz

From 6f48425bbb382a996188012844245609b1bcad2b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 27 Feb 2014 10:24:43 +0100
Subject: [PATCH 12/18] Add upstream patches for GNOME bugs #724023, #722041
 and #722698 as suggested in bug #1070443

---
 ...EMailFormatter-in-the-main-UI-thread.patch | 73 +++++++++++++++++
 ...Messages-are-silently-dropped-from-O.patch | 82 +++++++++++++++++++
 ...g-722698-Crash-creating-a-new-folder.patch | 44 ++++++++++
 evolution.spec                                | 13 ++-
 4 files changed, 211 insertions(+), 1 deletion(-)
 create mode 100644 0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
 create mode 100644 0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
 create mode 100644 0003-Bug-722698-Crash-creating-a-new-folder.patch

diff --git a/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch b/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
new file mode 100644
index 0000000..7f0d8d1
--- /dev/null
+++ b/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
@@ -0,0 +1,73 @@
+From 37a95e0e6b74fa9fe1692c788983142d8d4774d4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 10 Feb 2014 15:59:24 +0100
+Subject: [PATCH 2/7] Bug #724023 - Run EMailFormatter in the main/UI thread
+
+Any GtkWidget creation or manipulation should be done exclusively
+from the main/UI thread, thus make sure it is done that way.
+Of course, evolution can freeze for a little time (depends on the message
+size), until its formatting is done. It's unnoticeable with usual messages.
+---
+ em-format/e-mail-part-attachment-bar.c | 17 ++++++++++++-----
+ mail/e-mail-request.c                  |  9 ++++++---
+ 2 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c
+index 5cebd9b..57f49be 100644
+--- a/em-format/e-mail-part-attachment-bar.c
++++ b/em-format/e-mail-part-attachment-bar.c
+@@ -60,12 +60,7 @@ e_mail_part_attachment_bar_class_init (EMailPartAttachmentBarClass *class)
+ static void
+ e_mail_part_attachment_bar_init (EMailPartAttachmentBar *part)
+ {
+-	GtkTreeModel *tree_model;
+-
+ 	part->priv = E_MAIL_PART_ATTACHMENT_BAR_GET_PRIVATE (part);
+-
+-	tree_model = e_attachment_store_new ();
+-	part->priv->store = E_ATTACHMENT_STORE (tree_model);
+ }
+ 
+ EMailPart *
+@@ -84,6 +79,18 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part)
+ {
+ 	g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT_BAR (part), NULL);
+ 
++	if (!part->priv->store) {
++		GtkTreeModel *tree_model;
++
++		/* Create the store only on demand. The EMailParser runs in a dedicated
++		   thread, but the EAttachmentStore is a GtkWidget descendant, which should
++		   be manipulated only from the main/UI thread, thus postpone its creating
++		   until it's really needed, which might be during the EMailFormatter run,
++		   which runs from the main/UI thread. */
++		tree_model = e_attachment_store_new ();
++		part->priv->store = E_ATTACHMENT_STORE (tree_model);
++	}
++
+ 	return part->priv->store;
+ }
+ 
+diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
+index bfbedc3..615bce3 100644
+--- a/mail/e-mail-request.c
++++ b/mail/e-mail-request.c
+@@ -365,9 +365,12 @@ mail_request_send_async (SoupRequest *request,
+ 			simple, handle_contact_photo_request,
+ 			G_PRIORITY_DEFAULT, cancellable);
+ 	} else {
+-		g_simple_async_result_run_in_thread (
+-			simple, handle_mail_request,
+-			G_PRIORITY_DEFAULT, cancellable);
++		/* Process e-mail mail requests in this thread, which should be
++		   the main/UI thread, because any EMailFormatter can create
++		   GtkWidget-s, or manipulate with them, which should be always
++		   done in the main/UI thread. */
++		handle_mail_request (simple, G_OBJECT (request), cancellable);
++		g_simple_async_result_complete_in_idle (simple);
+ 	}
+ 
+ 	g_object_unref (simple);
+-- 
+1.9.0
+
diff --git a/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch b/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
new file mode 100644
index 0000000..2fc1da0
--- /dev/null
+++ b/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
@@ -0,0 +1,82 @@
+From 9de8f573e9eba07a096c7f97f97bb5ac876278c8 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 10 Feb 2014 17:57:28 +0100
+Subject: [PATCH 3/7] Bug #722041 - NNTP Messages are silently dropped from
+ Outbox
+
+---
+ libemail-engine/mail-ops.c | 20 ++++++++------------
+ 1 file changed, 8 insertions(+), 12 deletions(-)
+
+diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
+index 4f3dbd3..4db5dae 100644
+--- a/libemail-engine/mail-ops.c
++++ b/libemail-engine/mail-ops.c
+@@ -682,22 +682,18 @@ mail_send_message (struct _send_queue_msg *m,
+ 	info = camel_message_info_new (NULL);
+ 	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
+ 
+-	for (header = xev; header; header = header->next) {
++	for (header = xev; header && !local_error; header = header->next) {
+ 		gchar *uri;
+ 
+ 		if (strcmp (header->name, "X-Evolution-PostTo") != 0)
+ 			continue;
+ 
+-		/* TODO: don't lose errors */
+-
+ 		uri = g_strstrip (g_strdup (header->value));
+-		/* FIXME Not passing a GCancellable or GError here. */
+ 		folder = e_mail_session_uri_to_folder_sync (
+-			m->session, uri, 0, NULL, NULL);
++			m->session, uri, 0, cancellable, &local_error);
+ 		if (folder != NULL) {
+-			/* FIXME Not passing a GCancellable or GError here. */
+ 			camel_folder_append_message_sync (
+-				folder, message, info, NULL, NULL, NULL);
++				folder, message, info, NULL, cancellable, &local_error);
+ 			g_object_unref (folder);
+ 			folder = NULL;
+ 		}
+@@ -707,7 +703,7 @@ mail_send_message (struct _send_queue_msg *m,
+ 	/* post process */
+ 	mail_tool_restore_xevolution_headers (message, xev);
+ 
+-	if (driver) {
++	if (local_error == NULL && driver) {
+ 		camel_filter_driver_filter_message (
+ 			driver, message, info, NULL, NULL,
+ 			NULL, "", cancellable, &local_error);
+@@ -735,10 +731,9 @@ mail_send_message (struct _send_queue_msg *m,
+ 		}
+ 	}
+ 
+-	if (provider == NULL
+-	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) {
++	if (local_error == NULL && (provider == NULL
++	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))) {
+ 		CamelFolder *local_sent_folder;
+-		GError *local_error = NULL;
+ 
+ 		local_sent_folder = e_mail_session_get_local_folder (
+ 			m->session, E_MAIL_LOCAL_FOLDER_SENT);
+@@ -798,6 +793,7 @@ mail_send_message (struct _send_queue_msg *m,
+ 					_("Failed to append to "
+ 					"local 'Sent' folder: %s"),
+ 					local_error->message);
++				g_clear_error (&local_error);
+ 			}
+ 		}
+ 	}
+@@ -836,7 +832,7 @@ mail_send_message (struct _send_queue_msg *m,
+ 		camel_folder_synchronize_sync (queue, FALSE, NULL, NULL);
+ 	}
+ 
+-	if (err->len > 0) {
++	if (local_error == NULL && err->len > 0) {
+ 		/* set the culmulative exception report */
+ 		g_set_error (
+ 			&local_error, CAMEL_ERROR,
+-- 
+1.9.0
+
diff --git a/0003-Bug-722698-Crash-creating-a-new-folder.patch b/0003-Bug-722698-Crash-creating-a-new-folder.patch
new file mode 100644
index 0000000..1c72b61
--- /dev/null
+++ b/0003-Bug-722698-Crash-creating-a-new-folder.patch
@@ -0,0 +1,44 @@
+From 5e4b28e2fae285fa632ab189707489e0df8d79aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
+Date: Tue, 21 Jan 2014 15:48:54 +0100
+Subject: [PATCH 5/7] Bug #722698 - Crash creating a new folder
+
+---
+ mail/em-folder-tree.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
+index b15041a..cd7f67e 100644
+--- a/mail/em-folder-tree.c
++++ b/mail/em-folder-tree.c
+@@ -1108,15 +1108,27 @@ folder_tree_dispose (GObject *object)
+ {
+ 	EMFolderTreePrivate *priv;
+ 	GtkTreeModel *model;
++	GtkTreeSelection *selection;
+ 
+ 	priv = EM_FOLDER_TREE_GET_PRIVATE (object);
+ 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (object));
++	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
+ 
+ 	if (priv->loaded_row_id != 0) {
+ 		g_signal_handler_disconnect (model, priv->loaded_row_id);
+ 		priv->loaded_row_id = 0;
+ 	}
+ 
++	if (priv->loading_row_id != 0) {
++		g_signal_handler_disconnect (model, priv->loading_row_id);
++		priv->loading_row_id = 0;
++	}
++
++	if (priv->selection_changed_handler_id != 0) {
++		g_signal_handler_disconnect (selection, priv->selection_changed_handler_id);
++		priv->selection_changed_handler_id = 0;
++	}
++
+ 	if (priv->autoscroll_id != 0) {
+ 		g_source_remove (priv->autoscroll_id);
+ 		priv->autoscroll_id = 0;
+-- 
+1.9.0
+
diff --git a/evolution.spec b/evolution.spec
index ee00eb2..5ccdbd1 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.10.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -51,6 +51,11 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+# set of patches from RH bug #1070443
+Patch03: 0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
+Patch04: 0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
+Patch05: 0003-Bug-722698-Crash-creating-a-new-folder.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -201,6 +206,9 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
+%patch03 -p1 -b .ui-thread
+%patch04 -p1 -b .nntp-dropped
+%patch05 -p1 -b .new-folder-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -530,6 +538,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Feb 27 2014 Michael Kuhn <suraia@ikkoku.de> - 3.10.4-2
+- Add upstream patches for GNOME bugs #724023, #722041 and #722698
+
 * Mon Feb 10 2014 Milan Crha <mcrha@redhat.com> - 3.10.4-1
 - Update to 3.10.4
 

From 6fd704e8032883a9b80e6d2524c2620ea1ae5ed8 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 17 Apr 2014 13:45:47 +0100
Subject: [PATCH 13/18] Update to 3.12.1

---
 .gitignore                                    |  1 +
 ...EMailFormatter-in-the-main-UI-thread.patch | 73 -----------------
 ...Messages-are-silently-dropped-from-O.patch | 82 -------------------
 ...g-722698-Crash-creating-a-new-folder.patch | 44 ----------
 evolution.spec                                | 17 ++--
 sources                                       |  2 +-
 6 files changed, 8 insertions(+), 211 deletions(-)
 delete mode 100644 0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
 delete mode 100644 0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
 delete mode 100644 0003-Bug-722698-Crash-creating-a-new-folder.patch

diff --git a/.gitignore b/.gitignore
index e34431b..a966c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.10.2.tar.xz
 /evolution-3.10.3.tar.xz
 /evolution-3.10.4.tar.xz
+/evolution-3.12.1.tar.xz
diff --git a/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch b/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
deleted file mode 100644
index 7f0d8d1..0000000
--- a/0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 37a95e0e6b74fa9fe1692c788983142d8d4774d4 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 15:59:24 +0100
-Subject: [PATCH 2/7] Bug #724023 - Run EMailFormatter in the main/UI thread
-
-Any GtkWidget creation or manipulation should be done exclusively
-from the main/UI thread, thus make sure it is done that way.
-Of course, evolution can freeze for a little time (depends on the message
-size), until its formatting is done. It's unnoticeable with usual messages.
----
- em-format/e-mail-part-attachment-bar.c | 17 ++++++++++++-----
- mail/e-mail-request.c                  |  9 ++++++---
- 2 files changed, 18 insertions(+), 8 deletions(-)
-
-diff --git a/em-format/e-mail-part-attachment-bar.c b/em-format/e-mail-part-attachment-bar.c
-index 5cebd9b..57f49be 100644
---- a/em-format/e-mail-part-attachment-bar.c
-+++ b/em-format/e-mail-part-attachment-bar.c
-@@ -60,12 +60,7 @@ e_mail_part_attachment_bar_class_init (EMailPartAttachmentBarClass *class)
- static void
- e_mail_part_attachment_bar_init (EMailPartAttachmentBar *part)
- {
--	GtkTreeModel *tree_model;
--
- 	part->priv = E_MAIL_PART_ATTACHMENT_BAR_GET_PRIVATE (part);
--
--	tree_model = e_attachment_store_new ();
--	part->priv->store = E_ATTACHMENT_STORE (tree_model);
- }
- 
- EMailPart *
-@@ -84,6 +79,18 @@ e_mail_part_attachment_bar_get_store (EMailPartAttachmentBar *part)
- {
- 	g_return_val_if_fail (E_IS_MAIL_PART_ATTACHMENT_BAR (part), NULL);
- 
-+	if (!part->priv->store) {
-+		GtkTreeModel *tree_model;
-+
-+		/* Create the store only on demand. The EMailParser runs in a dedicated
-+		   thread, but the EAttachmentStore is a GtkWidget descendant, which should
-+		   be manipulated only from the main/UI thread, thus postpone its creating
-+		   until it's really needed, which might be during the EMailFormatter run,
-+		   which runs from the main/UI thread. */
-+		tree_model = e_attachment_store_new ();
-+		part->priv->store = E_ATTACHMENT_STORE (tree_model);
-+	}
-+
- 	return part->priv->store;
- }
- 
-diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
-index bfbedc3..615bce3 100644
---- a/mail/e-mail-request.c
-+++ b/mail/e-mail-request.c
-@@ -365,9 +365,12 @@ mail_request_send_async (SoupRequest *request,
- 			simple, handle_contact_photo_request,
- 			G_PRIORITY_DEFAULT, cancellable);
- 	} else {
--		g_simple_async_result_run_in_thread (
--			simple, handle_mail_request,
--			G_PRIORITY_DEFAULT, cancellable);
-+		/* Process e-mail mail requests in this thread, which should be
-+		   the main/UI thread, because any EMailFormatter can create
-+		   GtkWidget-s, or manipulate with them, which should be always
-+		   done in the main/UI thread. */
-+		handle_mail_request (simple, G_OBJECT (request), cancellable);
-+		g_simple_async_result_complete_in_idle (simple);
- 	}
- 
- 	g_object_unref (simple);
--- 
-1.9.0
-
diff --git a/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch b/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
deleted file mode 100644
index 2fc1da0..0000000
--- a/0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 9de8f573e9eba07a096c7f97f97bb5ac876278c8 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Feb 2014 17:57:28 +0100
-Subject: [PATCH 3/7] Bug #722041 - NNTP Messages are silently dropped from
- Outbox
-
----
- libemail-engine/mail-ops.c | 20 ++++++++------------
- 1 file changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
-index 4f3dbd3..4db5dae 100644
---- a/libemail-engine/mail-ops.c
-+++ b/libemail-engine/mail-ops.c
-@@ -682,22 +682,18 @@ mail_send_message (struct _send_queue_msg *m,
- 	info = camel_message_info_new (NULL);
- 	camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0);
- 
--	for (header = xev; header; header = header->next) {
-+	for (header = xev; header && !local_error; header = header->next) {
- 		gchar *uri;
- 
- 		if (strcmp (header->name, "X-Evolution-PostTo") != 0)
- 			continue;
- 
--		/* TODO: don't lose errors */
--
- 		uri = g_strstrip (g_strdup (header->value));
--		/* FIXME Not passing a GCancellable or GError here. */
- 		folder = e_mail_session_uri_to_folder_sync (
--			m->session, uri, 0, NULL, NULL);
-+			m->session, uri, 0, cancellable, &local_error);
- 		if (folder != NULL) {
--			/* FIXME Not passing a GCancellable or GError here. */
- 			camel_folder_append_message_sync (
--				folder, message, info, NULL, NULL, NULL);
-+				folder, message, info, NULL, cancellable, &local_error);
- 			g_object_unref (folder);
- 			folder = NULL;
- 		}
-@@ -707,7 +703,7 @@ mail_send_message (struct _send_queue_msg *m,
- 	/* post process */
- 	mail_tool_restore_xevolution_headers (message, xev);
- 
--	if (driver) {
-+	if (local_error == NULL && driver) {
- 		camel_filter_driver_filter_message (
- 			driver, message, info, NULL, NULL,
- 			NULL, "", cancellable, &local_error);
-@@ -735,10 +731,9 @@ mail_send_message (struct _send_queue_msg *m,
- 		}
- 	}
- 
--	if (provider == NULL
--	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER)) {
-+	if (local_error == NULL && (provider == NULL
-+	    || !(provider->flags & CAMEL_PROVIDER_DISABLE_SENT_FOLDER))) {
- 		CamelFolder *local_sent_folder;
--		GError *local_error = NULL;
- 
- 		local_sent_folder = e_mail_session_get_local_folder (
- 			m->session, E_MAIL_LOCAL_FOLDER_SENT);
-@@ -798,6 +793,7 @@ mail_send_message (struct _send_queue_msg *m,
- 					_("Failed to append to "
- 					"local 'Sent' folder: %s"),
- 					local_error->message);
-+				g_clear_error (&local_error);
- 			}
- 		}
- 	}
-@@ -836,7 +832,7 @@ mail_send_message (struct _send_queue_msg *m,
- 		camel_folder_synchronize_sync (queue, FALSE, NULL, NULL);
- 	}
- 
--	if (err->len > 0) {
-+	if (local_error == NULL && err->len > 0) {
- 		/* set the culmulative exception report */
- 		g_set_error (
- 			&local_error, CAMEL_ERROR,
--- 
-1.9.0
-
diff --git a/0003-Bug-722698-Crash-creating-a-new-folder.patch b/0003-Bug-722698-Crash-creating-a-new-folder.patch
deleted file mode 100644
index 1c72b61..0000000
--- a/0003-Bug-722698-Crash-creating-a-new-folder.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5e4b28e2fae285fa632ab189707489e0df8d79aa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
-Date: Tue, 21 Jan 2014 15:48:54 +0100
-Subject: [PATCH 5/7] Bug #722698 - Crash creating a new folder
-
----
- mail/em-folder-tree.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
-index b15041a..cd7f67e 100644
---- a/mail/em-folder-tree.c
-+++ b/mail/em-folder-tree.c
-@@ -1108,15 +1108,27 @@ folder_tree_dispose (GObject *object)
- {
- 	EMFolderTreePrivate *priv;
- 	GtkTreeModel *model;
-+	GtkTreeSelection *selection;
- 
- 	priv = EM_FOLDER_TREE_GET_PRIVATE (object);
- 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (object));
-+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
- 
- 	if (priv->loaded_row_id != 0) {
- 		g_signal_handler_disconnect (model, priv->loaded_row_id);
- 		priv->loaded_row_id = 0;
- 	}
- 
-+	if (priv->loading_row_id != 0) {
-+		g_signal_handler_disconnect (model, priv->loading_row_id);
-+		priv->loading_row_id = 0;
-+	}
-+
-+	if (priv->selection_changed_handler_id != 0) {
-+		g_signal_handler_disconnect (selection, priv->selection_changed_handler_id);
-+		priv->selection_changed_handler_id = 0;
-+	}
-+
- 	if (priv->autoscroll_id != 0) {
- 		g_source_remove (priv->autoscroll_id);
- 		priv->autoscroll_id = 0;
--- 
-1.9.0
-
diff --git a/evolution.spec b/evolution.spec
index 5ccdbd1..5647d97 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,14 +30,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.10.4
-Release: 2%{?dist}
+Version: 3.12.1
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -51,11 +51,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
-# set of patches from RH bug #1070443
-Patch03: 0001-Bug-724023-Run-EMailFormatter-in-the-main-UI-thread.patch
-Patch04: 0002-Bug-722041-NNTP-Messages-are-silently-dropped-from-O.patch
-Patch05: 0003-Bug-722698-Crash-creating-a-new-folder.patch
-
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -206,9 +201,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
-%patch03 -p1 -b .ui-thread
-%patch04 -p1 -b .nntp-dropped
-%patch05 -p1 -b .new-folder-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -538,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Apr 17 2014 Richard Hughes <rhughes@redhat.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Thu Feb 27 2014 Michael Kuhn <suraia@ikkoku.de> - 3.10.4-2
 - Add upstream patches for GNOME bugs #724023, #722041 and #722698
 
diff --git a/sources b/sources
index 07ea052..5c2ceb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f19aea3477f72c5afa51f4b3e4a8adf5  evolution-3.10.4.tar.xz
+03fd35c2ec39a90221c16400f8797623  evolution-3.12.1.tar.xz

From 8a89d52cf620a3bbd2e1d20bcae20cb29410e8b7 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 17 Apr 2014 13:46:52 +0100
Subject: [PATCH 14/18] Sync with rawhide

---
 evolution-2.30.1-help-contents.patch |  21 ----
 evolution.spec                       | 139 +++++++++++++--------------
 2 files changed, 67 insertions(+), 93 deletions(-)
 delete mode 100644 evolution-2.30.1-help-contents.patch

diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch
deleted file mode 100644
index 650e6de..0000000
--- a/evolution-2.30.1-help-contents.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c
---- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents	2013-09-07 18:34:59.000000000 +0200
-+++ evolution-3.10.0/shell/e-shell-window-actions.c	2013-10-10 08:51:03.863987108 +0200
-@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo
- 	if (path == NULL)
- 		gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
- 	g_free (path);
-+
-+	/* Viewing user documentation requires the evolution-help
-+	 * Fedora package.  Look for one of the files it installs. */
-+	path = g_build_filename (
-+		EVOLUTION_DATADIR, "help", "C",
-+		PACKAGE, "index.page", NULL);
-+	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
-+		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
-+		gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
-+	}
-+	g_free (path);
- }
- 
- GtkWidget *
diff --git a/evolution.spec b/evolution.spec
index 5647d97..5f87ebb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,6 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-%define glib2_version 2.34.0
+%define glib2_version 2.36.0
 %define gtk3_version 3.4.0
 %define gtkhtml_version 4.5.2
 %define gnome_desktop_version 2.91.3
@@ -10,20 +10,20 @@
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libsoup_version 2.40.3
-%define clutter_gtk_version 0.10
 %define webkit_version 1.8.0
 
-%define evo_base_version 3.10
+%define evo_base_version 3.12
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
 %define last_evo_nm_version 3.5.0
 
-%define inline_audio_support 1
 %define ldap_support 1
 %define libnotify_support 1
 %define libpst_support 1
-%define krb5_support 1
+
+# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
+%{!?with_docs: %define with_docs 1}
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins
 
@@ -35,7 +35,7 @@ Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
-URL: http://projects.gnome.org/evolution/
+URL: https://wiki.gnome.org/Apps/Evolution
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz
 
@@ -48,72 +48,68 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 # bad hack
 Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 
-# RH bug #589555
-Patch02: evolution-2.30.1-help-contents.patch
-
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gvfs
+Requires: gtkspell3
 Requires: highlight
 
 ### Build Dependencies ###
 
-BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
-BuildRequires: cairo-gobject-devel
-BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
 BuildRequires: desktop-file-utils
-BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: gettext
-BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
-BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
-BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version}
-BuildRequires: gnome-online-accounts
-BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
-BuildRequires: libcanberra-devel
-BuildRequires: libgdata-devel >= %{libgdata_version}
-BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: libpst-devel
-BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: libtool >= 1.5
-BuildRequires: libxml2-devel
-BuildRequires: nspr-devel
-BuildRequires: nss-devel
 BuildRequires: pkgconfig
-BuildRequires: webkitgtk3-devel >= %{webkit_version}
 BuildRequires: yelp-tools
 
-%if %{inline_audio_support}
-BuildRequires: gstreamer1-devel
-%endif
+BuildRequires: pkgconfig(atk)
+BuildRequires: pkgconfig(cairo-gobject)
+BuildRequires: pkgconfig(camel-1.2) >= %{version}
+BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gcr-3)
+BuildRequires: pkgconfig(gdk-pixbuf-2.0)
+BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
+BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version}
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
+BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
+BuildRequires: pkgconfig(gtkspell3-3.0)
+BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libebackend-1.2) >= %{version}
+BuildRequires: pkgconfig(libebook-1.2) >= %{version}
+BuildRequires: pkgconfig(libecal-1.2) >= %{version}
+BuildRequires: pkgconfig(libedataserver-1.2) >= %{version}
+BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
+BuildRequires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
+BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(nspr)
+BuildRequires: pkgconfig(nss)
+BuildRequires: pkgconfig(shared-mime-info)
+BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version}
 
 %if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11 
 %endif
 
-%if %{krb5_support} 
-BuildRequires: krb5-devel 
-# tweak for krb5 1.2 vs 1.3
-%define krb5dir /usr/kerberos
-#define krb5dir `pwd`/krb5-fakeprefix
-%endif
-
 %if %{libnotify_support}
-BuildRequires: libnotify-devel
+BuildRequires: pkgconfig(libnotify)
 %endif
 
 %if %{libpst_support}
-BuildRequires: libpst-devel
+BuildRequires: pkgconfig(libpst)
 %endif
 
 %description
@@ -126,13 +122,19 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: evolution-data-server-devel >= %{version}
-Requires: gtk3-devel >= %{gtk3_version}
-Requires: gtkhtml3-devel >= %{gtkhtml_version}
-Requires: libgdata-devel >= %{libgdata_version}
-Requires: libgweather-devel >= %{libgweather_version}
-Requires: libsoup-devel >= %{libsoup_version}
-Requires: libxml2-devel
+Requires: pkgconfig(camel-1.2) >= %{version}
+Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
+Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version}
+Requires: pkgconfig(gtkspell3-3.0)
+Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+Requires: pkgconfig(libebackend-1.2) >= %{version}
+Requires: pkgconfig(libebook-1.2) >= %{version}
+Requires: pkgconfig(libecal-1.2) >= %{version}
+Requires: pkgconfig(libedataserver-1.2) >= %{version}
+Requires: pkgconfig(libgdata) >= %{libgdata_version}
+Requires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version}
+Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+Requires: pkgconfig(libxml-2.0)
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
 %description devel
@@ -148,6 +150,7 @@ BuildArch: noarch
 %description devel-docs
 This package contains developer documentation for Evolution.
 
+%if %{with_docs}
 %package help
 Group: Applications/Productivity
 Summary: Help files for %{name}
@@ -157,6 +160,7 @@ BuildArch: noarch
 
 %description help
 This package contains user documentation for %{name}. 
+%endif
 
 %package bogofilter
 Group: Applications/Productivity
@@ -200,11 +204,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %prep
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
-%patch02 -p1 -b .help-contents
-
-mkdir -p krb5-fakeprefix/include
-mkdir -p krb5-fakeprefix/lib
-mkdir -p krb5-fakeprefix/%{_lib}
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -219,12 +218,6 @@ done
 %define ldap_flags --without-openldap
 %endif
 
-%if %{krb5_support}
-%define krb5_flags --with-krb5=%{krb5dir}
-%else
-%define krb5_flags --without-krb5
-%endif
-
 %define ssl_flags --enable-nss=yes --enable-smime=yes
 
 if ! pkg-config --exists nss; then 
@@ -232,8 +225,14 @@ if ! pkg-config --exists nss; then
   exit 1
 fi
 
+%if %{with_docs}
+%define gtkdoc_flags --enable-gtk-doc
+%else
+%define gtkdoc_flags --disable-gtk-doc
+%endif
+
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
 
 # Regenerate configure to pick up configure.ac changes
 aclocal -I m4
@@ -245,13 +244,14 @@ autoconf
 
 %configure \
 	--disable-maintainer-mode \
-	--enable-gtk-doc \
 	--with-sub-version=" (%{version}-%{release})" \
-	%ldap_flags %krb5_flags %ssl_flags \
+	%ldap_flags %ssl_flags %gtkdoc_flags \
 	--enable-plugins=all
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing"
 
+%if %{with_docs}
+
 # Strip unneeded translations from .mo files.
 # This reduces the RPM size by several megabytes.
 cd po
@@ -281,6 +281,8 @@ for f in $helpdir/C/figures/*.png; do
   done
 done
 
+# %{with_docs}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -295,11 +297,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
 # remove statically built libraries:
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
 
-# remove additional things we don't want
-%if ! %{inline_audio_support}
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
-%endif
-
 %find_lang evolution-%{evo_base_version} --all-name --with-gnome
 
 grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang
@@ -409,10 +406,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so
 %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so
 
-%if %{inline_audio_support}
-%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so
-%endif
-
 # Shared libraries:
 %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so
 %{_libdir}/evolution/%{evo_base_version}/libeabutil.so
@@ -495,20 +488,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/evolution-%{evo_base_version}
 %{_libdir}/pkgconfig/evolution-calendar-3.0.pc
 %{_libdir}/pkgconfig/evolution-mail-3.0.pc
-%{_libdir}/pkgconfig/evolution-plugin-3.0.pc
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 
 %files devel-docs
 %defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/evolution-mail-composer
+%doc %{_datadir}/gtk-doc/html/evolution-mail-engine
 %doc %{_datadir}/gtk-doc/html/evolution-mail-formatter
 %doc %{_datadir}/gtk-doc/html/evolution-shell
 %doc %{_datadir}/gtk-doc/html/evolution-util
 
+%if %{with_docs}
 %files help -f help.lang
 %defattr(-, root, root)
 %dir %{_datadir}/help/*/evolution
+%endif
 
 %files bogofilter
 %defattr(-, root, root)

From 67cf23deba0c15c33f3c4cb77c74b85139f80902 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 29 May 2014 20:13:11 +0100
Subject: [PATCH 15/18] Update to 3.12.2

---
 .gitignore     | 1 +
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a966c10..7720513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.10.3.tar.xz
 /evolution-3.10.4.tar.xz
 /evolution-3.12.1.tar.xz
+/evolution-3.12.2.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 5f87ebb..08f2925 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.12.1
+Version: 3.12.2
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu May 29 2014 Richard Hughes <rhughes@redhat.com> - 3.12.2-1
+- Update to 3.12.2
+
 * Thu Apr 17 2014 Richard Hughes <rhughes@redhat.com> - 3.12.1-1
 - Update to 3.12.1
 
diff --git a/sources b/sources
index 5c2ceb2..21232d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03fd35c2ec39a90221c16400f8797623  evolution-3.12.1.tar.xz
+cc5dd0abe5741bfa7ee5456df188a28f  evolution-3.12.2.tar.xz

From 67df746325335cbbb4a025a893bf49d2fa90b326 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 9 Jun 2014 11:19:54 +0200
Subject: [PATCH 16/18] Update to 3.12.3

---
 .gitignore     | 12 +++++++++---
 evolution.spec |  5 ++++-
 sources        |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7720513..82b0c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,8 +64,14 @@ evolution-2.31.5.tar.bz2
 /evolution-3.9.92.tar.xz
 /evolution-3.10.0.tar.xz
 /evolution-3.10.1.tar.xz
-/evolution-3.10.2.tar.xz
-/evolution-3.10.3.tar.xz
-/evolution-3.10.4.tar.xz
+/evolution-3.11.1.tar.xz
+/evolution-3.11.2.tar.xz
+/evolution-3.11.4.tar.xz
+/evolution-3.11.5.tar.xz
+/evolution-3.11.90.tar.xz
+/evolution-3.11.91.tar.xz
+/evolution-3.11.92.tar.xz
+/evolution-3.12.0.tar.xz
 /evolution-3.12.1.tar.xz
 /evolution-3.12.2.tar.xz
+/evolution-3.12.3.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 08f2925..59b8681 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.12.2
+Version: 3.12.3
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-1
+- Update to 3.12.3
+
 * Thu May 29 2014 Richard Hughes <rhughes@redhat.com> - 3.12.2-1
 - Update to 3.12.2
 
diff --git a/sources b/sources
index 21232d9..6191441 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc5dd0abe5741bfa7ee5456df188a28f  evolution-3.12.2.tar.xz
+7e359b94af6fe5380eb071ec24c486e5  evolution-3.12.3.tar.xz

From 3cdc0bece7c0a56a1f67f4b5f47a14497e1998e7 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 21 Jul 2014 12:40:44 +0200
Subject: [PATCH 17/18] Update to 3.12.4

---
 .gitignore     | 1 +
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82b0c5b..82edaf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.12.1.tar.xz
 /evolution-3.12.2.tar.xz
 /evolution-3.12.3.tar.xz
+/evolution-3.12.4.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 59b8681..721a9aa 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.12.3
+Version: 3.12.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jul 21 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
+- Update to 3.12.4
+
 * Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-1
 - Update to 3.12.3
 
diff --git a/sources b/sources
index 6191441..b58f30d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e359b94af6fe5380eb071ec24c486e5  evolution-3.12.3.tar.xz
+b94b63bd8a32527aa45b152878c0a354  evolution-3.12.4.tar.xz

From 95476fcfc1582c1bb3492835c02dba67f740eafc Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Fri, 5 Sep 2014 00:45:44 +0100
Subject: [PATCH 18/18] Update to 3.12.5

---
 .gitignore     | 1 +
 evolution.spec | 5 ++++-
 sources        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82edaf5..24d37fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.12.2.tar.xz
 /evolution-3.12.3.tar.xz
 /evolution-3.12.4.tar.xz
+/evolution-3.12.5.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 721a9aa..6498736 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -30,7 +30,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.12.4
+Version: 3.12.5
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Sep 04 2014 Richard Hughes <rhughes@redhat.com> - 3.12.5-1
+- Update to 3.12.5
+
 * Mon Jul 21 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
 - Update to 3.12.4
 
diff --git a/sources b/sources
index b58f30d..0991cb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b94b63bd8a32527aa45b152878c0a354  evolution-3.12.4.tar.xz
+4cf8ad5385889cc2a701397122c11487  evolution-3.12.5.tar.xz