From 40e99ccc98fdc7d11a42f69852be22b881241e0c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 26 Sep 2011 08:03:57 +0200
Subject: [PATCH] Update to 3.2.0

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

diff --git a/.gitignore b/.gitignore
index 3a50200..74c2528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.1.90.tar.xz
 /evolution-3.1.91.tar.xz
 /evolution-3.1.92.tar.xz
+/evolution-3.2.0.tar.xz
diff --git a/evolution.spec b/evolution.spec
index b3f08a2..9431a3d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -27,14 +27,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.1.92
+Version: 3.2.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.1/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -337,7 +337,11 @@ fi
 
 %pre bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
+
+%pre spamassassin
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
 
 %post
 /sbin/ldconfig
@@ -357,7 +361,11 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.
 
 %post bogofilter
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
+
+%post spamassassin
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
 
 %preun
 if [ "$1" -eq 0 ] ; then
@@ -377,7 +385,13 @@ fi
 %preun bogofilter
 if [ "$1" -eq 0 ] ; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || :
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || :
+fi
+
+%preun spamassassin
+if [ "$1" -eq 0 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || :
 fi
 
 %postun
@@ -634,6 +648,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 26 2011 Milan Crha <mcrha@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+- Manage properly schemas files for evolution-bogofilter/spamassassin
+
 * Mon Sep 19 2011 Milan Crha <mcrha@redhat.com> - 3.1.92-1
 - Update to 3.1.92
 
diff --git a/sources b/sources
index 1116eea..c0f9290 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4ce49224821c4f75805820df25d5382  evolution-3.1.92.tar.xz
+7c2143fe69343158ca220903b4f4b569  evolution-3.2.0.tar.xz