From 9f8dfb1e5d97b60d841b2d9551d4f606e49e2bcf Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 11 Aug 2014 11:24:02 +0200
Subject: [PATCH] Update to 3.12.5

---
 .gitignore                                    |  1 +
 ...ion-3.12.3-drop-gnome-icon-theme-dep.patch | 23 -------------------
 evolution.spec                                |  8 +++----
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 evolution-3.12.3-drop-gnome-icon-theme-dep.patch

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-3.12.3-drop-gnome-icon-theme-dep.patch b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch
deleted file mode 100644
index f3d5f23..0000000
--- a/evolution-3.12.3-drop-gnome-icon-theme-dep.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep evolution-3.12.3/configure.ac
---- evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep	2014-06-09 11:33:17.814864320 +0200
-+++ evolution-3.12.3/configure.ac	2014-06-09 11:33:44.925863171 +0200
-@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4.
- m4_define([gdk_pixbuf_minimum_version], [2.24.0])
- m4_define([gcr_minimum_version], [3.4])
- m4_define([gnome_desktop_minimum_version], [2.91.3])
--m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
- m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
- m4_define([webkitgtk_minimum_version], [2.0.1])
- m4_define([libgdata_minimum_version], [0.10])
-@@ -486,11 +485,6 @@ fi
- AC_CHECK_FUNCS(mkdtemp)
- 
- dnl **************************************************
--dnl Gnome Icon Theme
--dnl **************************************************
--PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version])
--
--dnl **************************************************
- dnl Accessibility support
- dnl **************************************************
- PKG_CHECK_MODULES([A11Y], [atk])
diff --git a/evolution.spec b/evolution.spec
index 29377a7..c5e68e8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,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
@@ -50,8 +50,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
-Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch
-
 ## Dependencies ###
 
 Requires: gvfs
@@ -207,7 +205,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 .drop-gnome-icon-theme-dep
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -529,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 11 2014 Milan Crha <mcrha@redhat.com> - 3.12.5-1
+- Update to 3.12.5
+
 * Mon Jul 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
 - Update to 3.12.4
 - Remove patch to fix folder names in Mail view's folder tree (fixed upstream)
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