From a109c4e73a44e81214a7d7bddbdee593e1a8cafe Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Nov 03 2008 19:01:44 +0000
Subject: - Update to 2.25.1

- Bump eds_base_version to 2.26.
- Remove patch for RH bug #467804 (fixed upstream).

---

diff --git a/.cvsignore b/.cvsignore
index b11ebc3..8365866 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.24.1.tar.bz2
+evolution-data-server-2.25.1.tar.bz2
diff --git a/evolution-data-server-2.24.1-remove-console-spew.patch b/evolution-data-server-2.24.1-remove-console-spew.patch
deleted file mode 100644
index 9fded0e..0000000
--- a/evolution-data-server-2.24.1-remove-console-spew.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up evolution-data-server-2.24.1/camel/camel-folder-summary.c.remove-console-spew evolution-data-server-2.24.1/camel/camel-folder-summary.c
---- evolution-data-server-2.24.1/camel/camel-folder-summary.c.remove-console-spew	2008-10-21 12:50:51.000000000 -0400
-+++ evolution-data-server-2.24.1/camel/camel-folder-summary.c	2008-10-23 14:45:04.000000000 -0400
-@@ -827,12 +827,12 @@ remove_cache (CamelSession *session, Cam
- 	if (time(NULL) - s->cache_load_time < SUMMARY_CACHE_DROP)
- 		return;
- 	
--	printf("removing cache for  %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), s->loaded_infos);
-+	d(printf("removing cache for  %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), s->loaded_infos));
- 	#warning "hack. fix it"
- 	CAMEL_SUMMARY_LOCK (s, summary_lock);
- 	g_hash_table_foreach_remove  (s->loaded_infos, (GHRFunc) remove_item, s);
- 	CAMEL_SUMMARY_UNLOCK (s, summary_lock);
--	printf("done .. now %d\n",g_hash_table_size (s->loaded_infos));
-+	d(printf("done .. now %d\n",g_hash_table_size (s->loaded_infos)));
- 
- 	s->cache_load_time = time(NULL);
- 	
-@@ -1378,7 +1378,7 @@ camel_folder_summary_save_to_db (CamelFo
- 	if (!count) 
- 		return camel_folder_summary_header_save_to_db (s, ex);
- 
--	printf("Saving %d/%d dirty records of %s\n", count, g_hash_table_size (s->loaded_infos), s->folder->full_name);
-+	d(printf("Saving %d/%d dirty records of %s\n", count, g_hash_table_size (s->loaded_infos), s->folder->full_name));
- 
- 	camel_db_begin_transaction (cdb, ex);
- 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index ef299d1..cce556c 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -13,7 +13,7 @@
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
-%define eds_base_version 2.24
+%define eds_base_version 2.26
 %define eds_api_version 1.2
 
 %define use_gnome_keyring 1
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.24.1
-Release: 2%{?dist}
+Version: 2.25.1
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -51,9 +51,6 @@ Patch12: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# RH bug #467804
-Patch14: evolution-data-server-2.24.1-remove-console-spew.patch
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -132,7 +129,6 @@ This package contains developer documentation for %{name}.
 %patch11 -p1 -b .fix-ldap-query
 %patch12 -p1 -b .camel-folder-summary-crash
 %patch13 -p1 -b .fix-64bit-acinclude
-%patch14 -p1 -b .remove-console-spew
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -378,6 +374,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Nov 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.1-1.fc11
+- Update to 2.25.1
+- Bump eds_base_version to 2.26.
+- Remove patch for RH bug #467804 (fixed upstream).
+
 * Thu Oct 23 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.1-2.fc10
 - Add patch for RH bug #467804 (remove console spew).
 
diff --git a/sources b/sources
index ab16ee9..cebfc3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d613412a079aebfaf0234637c92bc7c7  evolution-data-server-2.24.1.tar.bz2
+efa26d637653d97b69a7db3a37eb0841  evolution-data-server-2.25.1.tar.bz2