- Update to 2.23.5

- Remove patch for RH bug #534080 (fixed upstream).

.cvsignore

@@ -1 +1 @@
-evolution-data-server-2.23.4.tar.bz2
+evolution-data-server-2.23.5.tar.bz2

evolution-data-server-2.23.4-fix-attachment-saving.patch

@@ -1,28 +0,0 @@
-diff -up evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving evolution-data-server-2.23.4/camel/camel-stream-vfs.c
---- evolution-data-server-2.23.4/camel/camel-stream-vfs.c.fix-attachment-saving	2008-06-15 23:18:01.000000000 -0400
-+++ evolution-data-server-2.23.4/camel/camel-stream-vfs.c	2008-07-03 07:15:10.000000000 -0400
-@@ -211,20 +211,20 @@ stream_read (CamelStream *stream, char *
- static ssize_t
- stream_write (CamelStream *stream, const char *buffer, size_t n)
- {
--	gssize nwritten;
-+	gboolean success;
-+	gsize bytes_written;
- 	GError *error = NULL;
- 	CamelStreamVFS *stream_vfs = CAMEL_STREAM_VFS (stream);
- 
- 	g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream_vfs->stream), 0);
- 
--	nwritten = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, NULL, NULL, &error);
-+	success = g_output_stream_write_all (G_OUTPUT_STREAM (stream_vfs->stream), buffer, n, &bytes_written, NULL, &error);
- 
- 	if (error) {
- 		g_warning ("%s", error->message);
- 		g_error_free (error);
- 	}
--
--	return nwritten;
-+	return success ? bytes_written : -1;
- }
- 
- static int

evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch

@@ -0,0 +1,12 @@
+diff -up evolution-data-server-2.23.5/gtk-doc.make.fix-gtkdoc-mkhtml evolution-data-server-2.23.5/gtk-doc.make
+--- evolution-data-server-2.23.5/gtk-doc.make.fix-gtkdoc-mkhtml	2008-07-23 22:32:21.000000000 -0400
++++ evolution-data-server-2.23.5/gtk-doc.make	2008-07-23 22:32:31.000000000 -0400
+@@ -107,7 +107,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
+ 	@-chmod -R u+w $(srcdir)
+ 	rm -rf $(srcdir)/html
+ 	mkdir $(srcdir)/html
+-	cd $(srcdir)/html && gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
++	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS)
+ 	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ 	@echo 'gtk-doc: Fixing cross-references'
+ 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)

evolution-data-server.spec

@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.4
+Version: 2.23.5
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,8 +50,8 @@ 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 #534080
+# Fix broken gtk-doc.make
-Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch
+Patch14: evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch
 
 ### Build Dependencies ###
 
@@ -129,7 +129,7 @@ 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 .fix-attachment-saving
+%patch14 -p1 -b .fix-gtkdoc-mkhtml
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -322,6 +322,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # e-d-s extensions:
 %{eds_extensions_dir}/libebookbackendfile.so
+%{eds_extensions_dir}/libebookbackendgoogle.so
 %{eds_extensions_dir}/libebookbackendgroupwise.so
 %{eds_extensions_dir}/libebookbackendldap.so
 %{eds_extensions_dir}/libebookbackendvcf.so
@@ -376,11 +377,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jul 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.5-1.fc10
+- Update to 2.23.5
+- Remove patch for RH bug #534080 (fixed upstream).
+
 * Fri Jul 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 2.23.4-3
 - fix license tag
 
 * Thu Jul 03 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-2.fc10
-- Add patch for GNOME bug #534080 (fix attachment saving).
+- Add patch for RH bug #534080 (fix attachment saving).
 
 * Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 3.23.4-1.fc10
 - Update to 2.23.4

sources

@@ -1 +1 @@
-2b86e018c8483e5cc2077303ca8e57a7  evolution-data-server-2.23.4.tar.bz2
+73847cb2caac32e45499bbe3b88353c2  evolution-data-server-2.23.5.tar.bz2