[evolution] Update to 3.13.90

[Milan Crha]

commit 2f435143e84c8279a6cc57e9cb07ac73686ffb85
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Feb 16 11:36:23 2015 +0100

    Update to 3.13.90

 .gitignore                                       |    1 +
 evolution-3.12.3-drop-gnome-icon-theme-dep.patch |   23 -
 evolution-3.13.10-composer-backports.patch       |  742 ----------------------
 evolution.spec                                   |   23 +-
 sources                                          |    2 +-
 5 files changed, 11 insertions(+), 780 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 347c9af..c1b205d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.13.8.tar.xz
 /evolution-3.13.9.tar.xz
 /evolution-3.13.10.tar.xz
+/evolution-3.13.90.tar.xz
diff --git a/evolution.spec b/evolution.spec
index b4fdefc..83164fd 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,15 +1,14 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-%define glib2_version 2.36.0
-%define gtk3_version 3.4.0
-%define gtkhtml_version 4.5.2
+%define glib2_version 2.40.0
+%define gtk3_version 3.10.0
 %define gnome_desktop_version 2.91.3
 %define gnome_doc_utils_version 0.8.0
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libsoup_version 2.40.3
-%define webkit_version 1.8.0
+%define webkit_version 2.2.0
 
 %define evo_base_version 3.14
 
@@ -29,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.13.10
-Release: 2%{?dist}
+Version: 3.13.90
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -50,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
-# Backport WebKit composer fixes to test them in the wild
-Patch03: evolution-3.13.10-composer-backports.patch
-
 ## Dependencies ###
 
 Requires: gvfs
@@ -87,7 +83,6 @@ BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_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)
@@ -96,7 +91,6 @@ 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)
@@ -129,7 +123,6 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(camel-1.2) >= %{version}
 Requires: pkgconfig(cryptui-0.0)
 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}
@@ -137,7 +130,6 @@ 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}
@@ -219,7 +211,6 @@ the functionality of the installed %{name} package.
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
-%patch03 -p1 -b .composer_backports
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -547,6 +538,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Feb 16 2015 Milan Crha <mcrha at redhat.com> - 3.13.90-1
+- Update to 3.13.90
+- Remove WebKit composer patches (fixed upstream)
+
 * Mon Feb 02 2015 Tomas Popela <tpopela at redhat.com> - 3.13.10-2
 - Backport the WebKit composer patches
 
diff --git a/sources b/sources
index 4dc6c49..1336c2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b19376206d98624a5f232a7826872e3f  evolution-3.13.10.tar.xz
+36da0aab8ee71b73ccdc9fe4fbaa502a  evolution-3.13.90.tar.xz