--- a/ChangeLog	Fri Feb 29 12:23:27 2008 +0000
+++ b/ChangeLog	Fri Feb 29 12:38:38 2008 +0000
@@ -1,3 +1,11 @@
+2008-02-29  Takao Fujiwara  <[email protected]>
+
+	* SUNWxdg-user-dirs.spec: Updated to set filename_encoding=locale
+	* ext-sources/dtstart: Updated for Input Method.
+	* base-specs/gdm.spec: Updated
+	* patches/gdm-03-locale-support.diff: Added to copy settings
+	  from Xinitrc.jds
+
 2008-02-29  simon.zheng  <[email protected]>
 
 	* SUNWglibmm.spec:

--- a/SUNWxdg-user-dirs.spec	Fri Feb 29 12:23:27 2008 +0000
+++ b/SUNWxdg-user-dirs.spec	Fri Feb 29 12:38:38 2008 +0000
@@ -44,6 +44,10 @@
 %patch0 -p1
 %patch2 -p1
 
+sed -e "s/^filename_encoding=UTF-8/filename_encoding=locale/" \
+  user-dirs.conf > user-dirs.conf.$$
+mv user-dirs.conf.$$ user-dirs.conf
+
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -98,6 +102,8 @@
 
 
 %changelog
+* Fri Feb 29 2008 - [email protected]
+- set filename_encoding=locale
 * Mon Feb 25 2008 - [email protected]
 - Remove autostart file since the autoastart functionality is now provied by
   xdg-user-dirs-gtk

--- a/base-specs/gdm.spec	Fri Feb 29 12:23:27 2008 +0000
+++ b/base-specs/gdm.spec	Fri Feb 29 12:38:38 2008 +0000
@@ -29,6 +29,8 @@
 %endif
 #owner:yippi date:2007-08-02 type:feature bugzilla:457871
 Patch2:       gdm-02-showlocale.diff
+#owner:fujiwara date:2008-02-29  type:feature
+Patch3:       gdm-03-locale-support.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -102,6 +104,7 @@
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifos linux
@@ -222,6 +225,8 @@
 %config /etc/security/*
 
 %changelog
+* Fri Feb 29 2008 - [email protected]
+- Add gdm-03-locale-support.diff
 * Mon Jan 07 2008 - [email protected]
 - Bump to 2.20.3 and remove upstream patch.
 * Tue Nov 27 2007 - [email protected]

--- a/ext-sources/dtstart	Fri Feb 29 12:23:27 2008 +0000
+++ b/ext-sources/dtstart	Fri Feb 29 12:38:38 2008 +0000
@@ -61,6 +61,11 @@
     exit 1
 fi
 
+#Startup Input methods (IIIM->XIM)
+if [ -f /etc/iiim/xsession ]; then
+        . /etc/iiim/xsession
+fi
+
 # Use ssh-agent if available.
 #
 if [ -x "/usr/bin/ssh-agent" ] && [ -z "$SSH_AUTH_SOCK" ]; then

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-03-locale-support.diff	Fri Feb 29 12:38:38 2008 +0000
@@ -0,0 +1,17 @@
+--- gdm-2.20.3/config/Xsession.in.orig	2008-02-29 20:17:08.800554000 +0900
++++ gdm-2.20.3/config/Xsession.in	2008-02-29 20:20:34.204478000 +0900
+@@ -216,6 +216,14 @@ export G_BROKEN_FILENAMES
+ # G_FILENAME_ENCODING=@locale
+ # export G_FILENAME_ENCODING
+ 
++# Fixes 6583891
++export VTE_CJK_WIDTH=1
++
++# Fixes 6555226
++if [ "x$LANG" = "xzh" ] ; then
++  export LANGUAGE=zh:zh_CN.EUC
++fi
++
+ #Startup Input methods (IIIM->XIM)
+ if [ -f /etc/iiim/xsession ]; then
+ 	. /etc/iiim/xsession