rpms/evolution-data-server
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebuild against newer libxml2

Browse Source
This commit is contained in:
Milan Crha 2010-11-05 15:06:40 +01:00
parent d902f0d6b9
commit 69f44b512f
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evolution-data-server-2.91.1-gn631804.patch
View File

@ -1,12 +0,0 @@
diff -up evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c.gn631804 evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c
--- evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c.gn631804 2010-10-25 14:32:46.000000000 +0200
+++ evolution-data-server-2.91.1/camel/providers/imapx/camel-imapx-server.c 2010-10-25 14:33:25.000000000 +0200
@@ -4938,7 +4938,7 @@ imapx_server_dispose (GObject *object)
QUEUE_UNLOCK (server);
if (server->parser_thread) {
- g_thread_join (server->parser_thread);
+ //g_thread_join (server->parser_thread);
server->parser_thread = NULL;
}

10
evolution-data-server.spec
View File

@ -25,7 +25,7 @@
Name: evolution-data-server Name: evolution-data-server
Version: 2.91.1 Version: 2.91.1
Release: 1.1%{?dist} Release: 2%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: Backend data server for Evolution Summary: Backend data server for Evolution
License: LGPLv2+ License: LGPLv2+
@ -41,9 +41,6 @@ Obsoletes: evolution-webcal < 2.24.0
# RH bug #243296 # RH bug #243296
Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# Mask bug #631804
Patch12: evolution-data-server-2.91.1-gn631804.patch
### Build Dependencies ### ### Build Dependencies ###
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -121,7 +118,6 @@ This package contains developer documentation for %{name}.
%setup -q %setup -q
%patch11 -p1 -b .fix-64bit-acinclude %patch11 -p1 -b .fix-64bit-acinclude
%patch12 -p1 -b .gn631804
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -336,8 +332,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui %{_datadir}/gtk-doc/html/libedataserverui
%changelog %changelog
* Mon Oct 25 2010 Milan Crha <mcrha@redhat.com> - 2.91.1.1-1 * Fri Nov 05 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-2
- Add test patch to workaround imapx Gnome bug #631804 Rebuild against newer libxml2
* Mon Oct 18 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-1 * Mon Oct 18 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-1
- Update to 2.91.1 - Update to 2.91.1