--- a/Solaris/ChangeLog	Tue May 30 08:13:59 2006 +0000
+++ b/Solaris/ChangeLog	Tue May 30 08:14:39 2006 +0000
@@ -1,3 +1,10 @@
+2006-05-30 Irene Huang <[email protected]> 
+
+	* SUNWevolution-data-server.spec: Removed -I%{_includedir}/kerberosv5
+	from CFLAGS.
+	* patches/evolution-data-server-02-kerberos.diff: Modify patch to 
+	include the right gssapi.h under /usr/include/gssapi
+
 2006-05-29  Damien Carbery <[email protected]>
 
 	* SUNWevolution-data-server.spec: Add '-I%{_includedir}/kerberosv5' to 

--- a/Solaris/SUNWevolution-data-server.spec	Tue May 30 08:13:59 2006 +0000
+++ b/Solaris/SUNWevolution-data-server.spec	Tue May 30 08:14:39 2006 +0000
@@ -82,7 +82,7 @@
 #       should be re-enabled once these issues are fixed
 export LD=/usr/ccs/bin/ld
 export LDFLAGS="-Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
-export CFLAGS="-I%{_includedir} %optflags -I%{_includedir}/kerberosv5"
+export CFLAGS="-I%{_includedir} %optflags"
 export MSGFMT="/usr/bin/msgfmt"
 export PKG_CONFIG_PATH="%{_pkg_config_path}"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
@@ -136,6 +136,10 @@
 %endif
 
 %changelog
+* Tue May 30 2006 - [email protected]
+- Remove '-I%{_includedir}/kerberosv5' from CFLAGS as this has been
+  defined in evolution-data-server/configure.in
+
 * Mon May 29 2006 - [email protected]
 - Add '-I%{_includedir}/kerberosv5' to CFLAGS to find headers.
 

--- a/Solaris/patches/evolution-data-server-02-kerberos.diff	Tue May 30 08:13:59 2006 +0000
+++ b/Solaris/patches/evolution-data-server-02-kerberos.diff	Tue May 30 08:14:39 2006 +0000
@@ -54,3 +54,26 @@
  		fi
  		KRB5_LDFLAGS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
  	fi
+Index: camel/camel-sasl-gssapi.c
+===================================================================
+RCS file: /cvs/gnome/evolution-data-server/camel/camel-sasl-gssapi.c,v
+retrieving revision 1.15
+diff -u -r1.15 camel-sasl-gssapi.c
+--- camel/camel-sasl-gssapi.c	31 Aug 2005 04:21:56 -0000	1.15
++++ camel/camel-sasl-gssapi.c	30 May 2006 07:32:40 -0000
+@@ -39,9 +39,14 @@
+ #ifdef HAVE_MIT_KRB5
+ #include <gssapi/gssapi.h>
+ #include <gssapi/gssapi_generic.h>
+-#else /* HAVE_HEIMDAL_KRB5 */
++#endif
++#ifdef HAVE_HEIMDAL_KRB5
+ #include <gssapi.h>
+ #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE
++#else /* HAVE_SUN_KRB5 */
++#include <gssapi/gssapi.h>
++#include <gssapi/gssapi_ext.h>
++extern gss_OID gss_nt_service_name;
+ #endif
+ #include <errno.h>
+