From c0c14f5d2065ac34c832be96801c4723765aceba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Aug 2008 16:49:22 +0000 Subject: [PATCH] - Update to 2.23.6 --- evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch | 12 ------------ evolution-data-server.spec | 8 +------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch diff --git a/evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch b/evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch deleted file mode 100644 index 26d2d44..0000000 --- a/evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 9f89ede..66e211d 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -50,9 +50,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 -# Fix broken gtk-doc.make -Patch14: evolution-data-server-2.23.5-fix-gtkdoc-mkhtml.patch - ### Build Dependencies ### BuildRequires: GConf2-devel @@ -129,7 +126,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 .fix-gtkdoc-mkhtml mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -294,9 +290,6 @@ rm -rf $RPM_BUILD_ROOT %{camel_provider_dir}/libcamelgroupwise.so %{camel_provider_dir}/libcamelgroupwise.urls -%{camel_provider_dir}/libcamelhula.so -%{camel_provider_dir}/libcamelhula.urls - %{camel_provider_dir}/libcamelimap.so %{camel_provider_dir}/libcamelimap.urls @@ -326,6 +319,7 @@ rm -rf $RPM_BUILD_ROOT %{eds_extensions_dir}/libebookbackendgroupwise.so %{eds_extensions_dir}/libebookbackendldap.so %{eds_extensions_dir}/libebookbackendvcf.so +%{eds_extensions_dir}/libebookbackendwebdav.so %{eds_extensions_dir}/libecalbackendcaldav.so %{eds_extensions_dir}/libecalbackendcontacts.so %{eds_extensions_dir}/libecalbackendfile.so