--- a/ChangeLog	Wed Jul 23 13:55:03 2008 +0000
+++ b/ChangeLog	Wed Jul 23 14:23:08 2008 +0000
@@ -1,3 +1,9 @@
+2008-07-23  Jeff Cai <[email protected]>
+
+	* SUNWevolution.spec: Add a schema file.
+	* base-specs/evolution.spec: Bump to 2.23.5
+	* patches/evolution-10-em-migrate.diff: Added.
+
 2008-07-23  Damien Carbery <[email protected]>
 
 	* base-specs/evince.spec: Bump to 2.23.5. Remove upstream patch

--- a/SUNWevolution.spec	Wed Jul 23 13:55:03 2008 +0000
+++ b/SUNWevolution.spec	Wed Jul 23 14:23:08 2008 +0000
@@ -190,7 +190,8 @@
   echo '         $SDIR/apps-evolution-mail-prompts-checkdefault.schemas';
   echo '         $SDIR/apps_evolution_calendar.schemas';
   echo '         $SDIR/apps_evolution_shell.schemas';
-  echo '         $SDIR/evolution-mail.schemas"';
+  echo '         $SDIR/evolution-mail.schemas';
+  echo '         $SDIR/apps-evolution-template-placeholders.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas > /dev/null'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS_wait -a
 
@@ -281,8 +282,11 @@
 %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
 %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas
 
 %changelog
+* Wed Jul 23 2008 - [email protected]
+- Add apps-evolution-template-placeholders.schemas to %files root and %preun root.
 * Fri Jun 05 2008 - [email protected]
 - Add apps_evolution_email_custom_header.schemas to %files root and %preun root.
 * Wed Apr 02 2008 - [email protected]

--- a/base-specs/evolution.spec	Wed Jul 23 13:55:03 2008 +0000
+++ b/base-specs/evolution.spec	Wed Jul 23 14:23:08 2008 +0000
@@ -13,7 +13,7 @@
 Group:        System/GUI/GNOME
 # major_version is generally a 'stable' build number i.e. has an even number.
 %define major_version 2.24
-Version:      2.23.4
+Version:      2.23.5
 Release:      1
 Distribution: java-desktop-system
 Vendor:       Sun Microsystems, Inc.
@@ -44,6 +44,8 @@
 Patch8:       evolution-08-meeting.diff
 # date:2008-06-11 bugzilla:537752 owner:jefftsai type:bug
 Patch9:       evolution-09-mail-config.diff
+# date:2008-07-23 owner:jefftsai type:branding
+Patch10:       evolution-10-em-migrate.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/evolution
@@ -129,6 +131,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p0
 
 %build
 
@@ -254,6 +257,9 @@
 %{_datadir}/gnome-pilot/*
 
 %changelog
+* Tue Jul 23 2008 - [email protected]
+- Bump to 2.23.5.
+- Add patch -10-em-migrate.
 * Tue Jun 17 2008 - [email protected]
 - Bump to 2.23.4.
 * Wed Jun 11 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/evolution-10-em-migrate.diff	Wed Jul 23 14:23:08 2008 +0000
@@ -0,0 +1,13 @@
+Index: mail/em-migrate.c
+===================================================================
+--- mail/em-migrate.c	(revision 35824)
++++ mail/em-migrate.c	(working copy)
+@@ -2934,7 +2934,7 @@
+ 				migrate_folders(store, info, account->name, &ex);
+ 				
+ 			} else
+-				printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, __PRETTY_FUNCTION__);
++				printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ 			camel_exception_clear(&ex);
+ 				
+ 		}