rpms/evolution-data-server/devel evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch, NONE, 1.1 .cvsignore, 1.88, 1.89 evolution-data-server.spec, 1.221, 1.222 sources, 1.88, 1.89 evolution-data-server-2.23.4-fix-attachment-saving.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27336

Modified Files:
	.cvsignore evolution-data-server.spec sources 
Added Files:
	evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch 
Removed Files:
	evolution-data-server-2.23.4-fix-attachment-saving.patch 
Log Message:

* Mon Jul 21 2008 Matthew Barnes <mbarnes at redhat.com> - 2.23.5-1.fc10
- Update to 2.23.5
- Remove patch for RH bug #534080 (fixed upstream).


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

--- NEW FILE evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch ---
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)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- .cvsignore	16 Jun 2008 17:41:48 -0000	1.88
+++ .cvsignore	24 Jul 2008 03:00:01 -0000	1.89
@@ -1 +1 @@
-evolution-data-server-2.23.4.tar.bz2
+evolution-data-server-2.23.5.tar.bz2


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- evolution-data-server.spec	18 Jul 2008 13:23:46 -0000	1.221
+++ evolution-data-server.spec	24 Jul 2008 03:00:01 -0000	1.222
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.23.4
-Release: 3%{?dist}
+Version: 2.23.5
+Release: 1%{?dist}
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,8 +50,8 @@
 # RH bug #243296
 Patch13: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-# RH bug #534080
-Patch14: evolution-data-server-2.23.4-fix-attachment-saving.patch
+# Fix broken gtk-doc.make
+Patch14: evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch
 
 ### Build Dependencies ###
 
@@ -129,7 +129,7 @@
 %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 @@
 
 # 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 @@
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jul 21 2008 Matthew Barnes <mbarnes at 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 at redhat.com> 2.23.4-3
 - fix license tag
 
 * Thu Jul 03 2008 Matthew Barnes <mbarnes at 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 at redhat.com> - 3.23.4-1.fc10
 - Update to 2.23.4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	16 Jun 2008 17:41:49 -0000	1.88
+++ sources	24 Jul 2008 03:00:01 -0000	1.89
@@ -1 +1 @@
-2b86e018c8483e5cc2077303ca8e57a7  evolution-data-server-2.23.4.tar.bz2
+73847cb2caac32e45499bbe3b88353c2  evolution-data-server-2.23.5.tar.bz2


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