[evolution/f16] Update to 3.1.5

[Milan Crha]

commit 6674911764ca2ec791c3c6236d7537c210b8e8ac
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Aug 15 12:11:10 2011 +0200

    Update to 3.1.5

 .gitignore                             |    1 +
 evolution-3.1.4-resident-modules.patch |   29 -----------------------------
 evolution.spec                         |   12 ++++++------
 sources                                |    2 +-
 4 files changed, 8 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1da36f8..6b98c3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.1.2.tar.bz2
 /evolution-3.1.3.tar.bz2
 /evolution-3.1.4.tar.bz2
+/evolution-3.1.5.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 5f33489..5825f6c 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.1.4
-Release: 2%{?dist}
+Version: 3.1.5
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -47,9 +47,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch11: evolution-2.30.1-help-contents.patch
 
-# Make all dynamically-loaded modules resident.
-Patch12: evolution-3.1.4-resident-modules.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -206,7 +203,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .help-contents
-%patch12 -p1 -b .resident-modules
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -637,6 +633,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 15 2011 Milan Crha <mcrha at redhat.com> - 3.1.5-1
+- Update to 3.1.5
+- Remove patch for resident modules (fixed upstream)
+
 * Fri Aug 05 2011 Matthew Barnes <mbarnes at redhat.com> - 3.1.4-2
 - Add patch to make all dynamically-loaded modules resident to avoid a
   potential crash on startup.
diff --git a/sources b/sources
index 81d6f06..3f32bad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eff3a714a3fa97a3ceb624a0a8fd1059  evolution-3.1.4.tar.bz2
+01d2534c78884a2a1982d202d8e7896a  evolution-3.1.5.tar.bz2