[evolution/f14/master] * Tue Aug 03 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14 - Update to 2.31.6 - Drop dbus

[Matthew Barnes]

commit 95374ea1d21824ab970abbf07346272483696fcb
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Tue Aug 3 07:16:10 2010 -0400

    * Tue Aug 03 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14
    - Update to 2.31.6
    - Drop dbus-glib requirement.
    - Bump glib2 requirement to 2.25.12.
    - Add clutter-gtk requirement (for express mode).
    - Remove gtk-compat macro patch (fixed upstream).

 .gitignore                              |    1 +
 evolution-2.31.5-gtk-compat-crash.patch |   24 ------------------------
 evolution.spec                          |   21 ++++++++++++---------
 sources                                 |    2 +-
 4 files changed, 14 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a151a6e..81c6130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 evolution-2.31.5.tar.bz2
+evolution-2.31.6.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 6870f2b..b76d4d4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,5 @@
-%define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define glib2_version 2.22.0
+%define glib2_version 2.25.12
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -9,6 +8,7 @@
 %define intltool_version 0.35.5
 %define libgdata_version 0.6.3
 %define libgweather_version 2.25.4
+%define clutter_gtk_version 0.10
 %define soup_version 2.4.0
 
 %define evo_base_version 3.0
@@ -32,8 +32,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.31.5
-Release: 2%{?dist}
+Version: 2.31.6
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -55,9 +55,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch
 # RH bug #589555
 Patch13: evolution-2.30.1-help-contents.patch
 
-# Fixes a crash in gtk-compat.h macros
-Patch14: evolution-2.31.5-gtk-compat-crash.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -78,8 +75,8 @@ BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
 BuildRequires: bison
+BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
 BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: desktop-file-utils
 BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: gettext
@@ -210,7 +207,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch12 -p1 -b .im-context-reset
 %patch13 -p1 -b .help-contents
-%patch14 -p1 -b .gtk-compat-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -618,6 +614,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 03 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.6-1.fc14
+- Update to 2.31.6
+- Drop dbus-glib requirement.
+- Bump glib2 requirement to 2.25.12.
+- Add clutter-gtk requirement (for express mode).
+- Remove gtk-compat macro patch (fixed upstream).
+
 * Thu Jul 22 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.5-2.fc14
 - Add patch to fix startup crash in gtk-compat macros.
 
diff --git a/sources b/sources
index 7cb2a79..c46e87b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59a9c75d808788fa9eacce4a757b04fe  evolution-2.31.5.tar.bz2
+8522c7a972be2629924f985981911655  evolution-2.31.6.tar.bz2