From d124712bf02876c90bf235e91d7dd04a6ca3584a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Fri, 30 Oct 2009 03:15:29 +0000
Subject: [PATCH] - Snapshot of "kill-bonobo" progress at commit adadf13.

---
 .cvsignore                          |  2 +-
 evolution-kb-override-version.patch | 10 +++++-----
 evolution.spec                      | 11 +++++++----
 sources                             |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 93ad9b0..d84f530 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+evolution-2.29.2-kill-bonobo-adadf13.tar.bz2
diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch
index ce5c1d3..084e46c 100644
--- a/evolution-kb-override-version.patch
+++ b/evolution-kb-override-version.patch
@@ -1,11 +1,11 @@
-diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac
---- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
-+++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
+diff -up evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.2-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.2-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
 @@ -1,7 +1,7 @@
  dnl Evolution Versions
  m4_define([evo_major_version], [2])
 -m4_define([evo_minor_version], [29])
--m4_define([evo_micro_version], [1])
+-m4_define([evo_micro_version], [2])
 +m4_define([evo_minor_version], [27])
 +m4_define([evo_micro_version], [99])
  m4_define([evo_version],
@@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evol
 +m4_define([eds_minimum_version], [2.27.1])
  m4_define([gnome_icon_theme_minimum_version], [2.19.91])
  m4_define([gnome_desktop_minimum_version], [2.26.0])
- m4_define([libgtkhtml_minimum_version], [3.27.90])
+ m4_define([libgtkhtml_minimum_version], [3.29.1])
diff --git a/evolution.spec b/evolution.spec
index 612acb5..8c6b537 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,5 @@
 # This is an unofficial RPM for testing Evolution's kill-bonobo branch.
-%define hash 2fa61f4
+%define hash adadf13
 
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
@@ -45,13 +45,13 @@
 
 Name: evolution
 Version: 2.28.99
-Release: 1.kb.3%{?dist}
+Release: 1.kb.4%{?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: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2
+Source: %{name}-2.29.2-kill-bonobo-%{hash}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -222,7 +222,7 @@ Requires: %{name} = %{version}-%{release}
 This package contains supplemental utilities for %{name} that require Perl.
 
 %prep
-%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash}
+%setup -q -n %{name}-2.29.2-kill-bonobo-%{hash}
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Thu Oct 29 2009 Matthew Barnes <mbarnes@redhat.com> - 2.28.99-1.kb.4.fc12
+- Snapshot of "kill-bonobo" progress at commit adadf13.
+
 * Tue Sep 29 2009 Matthew Barnes <mbarnes@redhat.com> - 2.28.99-1.kb.3.fc12
 - Snapshot of "kill-bonobo" progress at commit 2fa61f4.
 
diff --git a/sources b/sources
index 8827e52..a463126 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f3e9f57c256b2596df051a6e42ca3b8  evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2
+a4e70c3dacff4169f9ae4fcc626b7a27  evolution-2.29.2-kill-bonobo-adadf13.tar.bz2