--- a/ChangeLog	Sat Sep 26 09:51:32 2009 +0000
+++ b/ChangeLog	Sat Sep 26 11:01:15 2009 +0000
@@ -1,3 +1,8 @@
+2009-09-26  Dave Lin <[email protected]>
+
+	* patches/SUNWgnome-dtlogin-integration-01-g11n-migration.diff: Removed.
+	* SUNWgnome-dtlogin-integration.spec: Removed upstreamded patch.
+
 2009-09-26  Dave Lin <[email protected]>
 
         * base-specs/deskbar-applet.spec: Bump to 2.28.0.

--- a/SUNWgnome-dtlogin-integration.spec	Sat Sep 26 09:51:32 2009 +0000
+++ b/SUNWgnome-dtlogin-integration.spec	Sat Sep 26 11:01:15 2009 +0000
@@ -32,7 +32,6 @@
 Source15:                0110.fonts
 Source16:                0120.xrdb
 Source17:                0210.im
-Patch1:                  %{name}-01-g11n-migration.diff
 SUNW_BaseDir:            %{dtlogin_config_basedir}
 SUNW_Copyright:          SUNWgnome-dtlogin-integration.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -65,8 +64,6 @@
 
 bash -x %SOURCE1 --enable-sun-linguas
 
-%patch1 -p1
-
 %build
 export LDFLAGS="%_ldflags"
 export CFLAGS="%optflags"
@@ -161,6 +158,8 @@
 
 
 %changelog
+* Sat Sep 26 2009 - [email protected]
+- Removed upstreamed patch 01-g11n-migration.diff.
 * Tue Sep 22 2009 - [email protected]
 - bump to 0.37.1
 * Mon Mar 23 2009 - [email protected]

--- a/patches/SUNWgnome-dtlogin-integration-01-g11n-migration.diff	Sat Sep 26 09:51:32 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
---- dtlogin-integration-0.37/config/Xinitrc.in.orig	2009-02-04 16:17:23.416565482 +0900
-+++ dtlogin-integration-0.37/config/Xinitrc.in	2009-02-04 16:17:58.467807163 +0900
-@@ -10,53 +10,6 @@
- ###
- #####################################################################
- 
--if [ "x$LC_ALL" = x -a "x$LANG" = x -o "x$LANG" = xC ]; then
--  :
--# This is needed until fix 6533406
--# European locales have LC_MESSAGES=C in /usr/lib/locale/*/locale_map
--else
--  export LC_MESSAGES=$LANG
--fi
--
--# Fixes 6555226
--if [ "x$LANG" = "xzh" ] ; then
--  export LANGUAGE=zh:zh_CN.EUC
--fi
--
--export G_FILENAME_ENCODING=@locale,UTF-8
--export G_BROKEN_FILENAMES=yes
--# Fixes 6583891
--case $LANG in
--ja*) export VTE_CJK_WIDTH=1;;
--ko*) export VTE_CJK_WIDTH=1;;
--zh*) export VTE_CJK_WIDTH=1;;
--*) ;;
--esac
--
--/usr/openwin/bin/xrdb -merge << EOF
--! Default CDE resources
--*WindowColor:           #8A008A008A00
--!*WindowForeground:      #FF0000000000
--!*DataBackground:        #0000FF000000
--*DataForeground:        #FF0000000000
--*WorkspaceColor:        #8A008A008A00
--*Color.Background:      #FF000000FF00
--!*Color.Foreground:      #0000FF000000
--*foreground:            #000000000000
--! Hack for Dtmail
--*XmText*background: seashell
--*XmTextField*background: seashell
--*Message_List*background: seashell
--*background:    #AE00B200C300
--Dthello*string:		Welcome to the Sun Java Desktop System
--EOF
--
--if [ -f $HOME/.Xdefaults ]; then
--    xrdb -merge $HOME/.Xdefaults        # Load Users X11 resource database
--fi
--
--@EXEC_PREFIX@/bin/linc-cleanup-sockets
--
- command=@EXEC_PREFIX@/bin/gnome-session
- 
- echo 'Starting gnome-session'