--- a/ChangeLog	Fri Jan 15 02:44:26 2010 +0000
+++ b/ChangeLog	Fri Jan 15 04:10:30 2010 +0000
@@ -1,3 +1,9 @@
+2010-01-15  Jeff Cai  <[email protected]>
+
+	* SUNWevolution-data-server.spec: Add dependency.
+	* patches/evolution-data-server-06-marshal-list.diff: 
+	  Reworked the patch
+
 2010-01-15  Jeff Cai  <[email protected]>
 
 	* SUNWlibgweather.spec: Remove locale files when building without 

--- a/SUNWevolution-data-server.spec	Fri Jan 15 02:44:26 2010 +0000
+++ b/SUNWevolution-data-server.spec	Fri Jan 15 04:10:30 2010 +0000
@@ -41,6 +41,7 @@
 Requires:      SUNWgss
 Requires:      SUNWsqlite3
 Requires:      SUNWlibical
+Requires:      SUNWprd
 %if %option_with_sun_branding
 Requires:      SUNWbdb
 %endif
@@ -59,6 +60,7 @@
 BuildRequires: SUNWhea
 BuildRequires: SUNWsqlite3
 BuildRequires: SUNWlibical
+BuildRequires: SUNWprd
 %if %option_with_sun_branding
 # must build the supported SUNWevolution-data-server product using
 # the version of bdb included in Solaris
@@ -165,6 +167,8 @@
 %endif
 
 %changelog
+* Fri Jan 15 2009 - [email protected]
+- Add dependency on SUNWprod which contains nspr
 * Wed Dec 23 - [email protected]
 - Use default ld.
 * Thu Dec 10 2009 - [email protected]

--- a/patches/evolution-data-server-06-marshal-list.diff	Fri Jan 15 02:44:26 2010 +0000
+++ b/patches/evolution-data-server-06-marshal-list.diff	Fri Jan 15 04:10:30 2010 +0000
@@ -1,11 +1,8 @@
---- evolution-data-server-2.29.3/libedataserverui/e-data-server-ui-marshal.list.orig	2009-12-03 18:51:30.553399000 +0800
-+++ evolution-data-server-2.29.3/libedataserverui/e-data-server-ui-marshal.list	2009-12-03 18:43:49.115897000 +0800
-@@ -0,0 +1,2 @@
-+BOOLEAN:OBJECT,BOXED
-+BOOLEAN:BOXED,OBJECT,FLAGS,UINT
---- evolution-data-server-2.29.4.orig/addressbook/libebook/e-book.c	2010-01-13 13:55:22.862085019 +0000
-+++ evolution-data-server-2.29.4/addressbook/libebook/e-book.c	2010-01-13 13:56:12.124995969 +0000
-@@ -1923,11 +1923,11 @@
+diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
+index e1042ab..75a3292 100644
+--- a/addressbook/libebook/e-book.c
++++ b/addressbook/libebook/e-book.c
+@@ -1923,11 +1923,11 @@ make_me_card (void)
  
  		western = e_name_western_parse (s);
  		g_string_append_printf (vcard, "N:%s;%s;%s;%s;%s\n",
@@ -14,11 +11,11 @@
 -					western->middle ?: "",
 -					western->prefix ?: "",
 -					western->suffix ?: "");
-+					"",
-+					"",
-+					"",
-+					"",
-+					"");
++					western->last ? western->last : "",
++					western->first ? western->first : "",
++					western->middle ? western->middle : "",
++					western->prefix ? western->prefix : "",
++					western->suffix ? western->suffix : "");
  		e_name_western_free (western);
  	}
  	g_string_append (vcard, "END:VCARD");