2010-04-26 Christian Kelly <[email protected]> * base-specs/gvfs.spec: Bump to 1.6.1. * base-specs/gcalctool.spec, patches/gcalctool-01-getline.diff: Bump to 5.30.1. * base-specs/evolution.spec: Bump to 2.30.1.1. * base-specs/gnome-doc-utils.spec: Bump to 0.20.1. * base-specs/java-atk-wrapper.spec: Bump to 0.30.0. * base-specs/at-spi.spec: Bump to 1.30.1. * base-specs/gtkhtml.spec: Bump to 3.30.1. * base-specs/gtksourceview2.spec: Bump to 2.10.1. * base-specs/control-center.spec, base-specs/mousetweaks.spec, base-specs/libgnome-keyring.spec, base-specs/gucharmap.spec, base-specs/evince.spec, base-specs/yelp.spec, base-specs/file-roller.spec, base-specs/gnome-keyring.spec, base-specs/orca.spec, base-specs/gnome-user-docs.spec, base-specs/gnome-devel-docs.spec, base-specs/gnome-settings-daemon.spec: Bump to 2.30.1. * base-specs/evolution-data-server.spec, patches/evolution-data-server-05-comm-err.diff: Bump to 2.30.1. * base-specs/nautilus.spec, patches/nautilus-14-zfs-snapshot.diff: Bump to 2.30.1. * specs/SUNWcheese.spec, patches/cheese-01-lack-v4l1.diff: Bump to 2.30.1.

diff -ruN evolution-data-server-2.30.1.orig/camel/camel-sasl-gssapi.c evolution-data-server-2.30.1/camel/camel-sasl-gssapi.c
--- evolution-data-server-2.30.1.orig/camel/camel-sasl-gssapi.c	2010-04-26 20:00:55.232977746 +0100
+++ evolution-data-server-2.30.1/camel/camel-sasl-gssapi.c	2010-04-26 20:04:04.341377459 +0100
@@ -31,18 +31,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#ifdef HAVE_HEIMDAL_KRB5
-#include <krb5.h>
-#else
-#include <krb5/krb5.h>
-#endif
-#ifdef HAVE_ET_COM_ERR_H
-#include <et/com_err.h>
-#else
-#ifdef HAVE_COM_ERR_H
-#include <com_err.h>
-#endif
-#endif
+#include <kerberosv5/krb5.h>
 #ifdef HAVE_MIT_KRB5
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>