--- a/ChangeLog	Thu Apr 05 02:29:21 2012 +0000
+++ b/ChangeLog	Mon Apr 09 01:04:34 2012 +0000
@@ -1,3 +1,10 @@
+2012-04-09  Peng Wang	<[email protected]>
+
+        Fix for 7060748: Some messages are not displayed correctly in
+		non-UTF-8 locale terminal environment
+	* base-specs/gdm.spec:
+	* patches/gdm-38-bindtextdomaincodeset.diff:
+
 2012-04-05  Leon Fan  <[email protected]>
 
 	RTI#361352
@@ -80,6 +87,7 @@
 	Added patch xscreensaver-23-bug-7136531.diff
 	Added patch xscreensaver-24-bug-7144354.diff
 
+>>>>>>> .r24332
 2012-03-30  Jerry Guo  <[email protected]>
 
         Fix for 7155901

--- a/base-specs/gdm.spec	Thu Apr 05 02:29:21 2012 +0000
+++ b/base-specs/gdm.spec	Mon Apr 09 01:04:34 2012 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -110,6 +110,8 @@
 Patch36:      gdm-36-no-remote-layout.diff
 #owner:yippi date:2011-02-21 type:bug
 Patch37:      gdm-37-strndup.diff
+# date:2012-03-23 owner:pengwang type:bug bugster: 7060748
+Patch38:      gdm-38-bindtextdomaincodeset.diff
 URL:          http://projects.gnome.org/gdm/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
@@ -159,6 +161,7 @@
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 
 cp %SOURCE1 gui/simple-greeter
 cp %SOURCE2 gui/simple-greeter
@@ -270,6 +273,8 @@
 %{_localstatedir}/lib/gdm
 
 %changelog
+* Fri Mar 23 2012 - [email protected]
+- Add gdm-38-bindtextdomaincodeset.diff to fix CR #7060748
 * Tue Feb 21 2012 - [email protected]
 - Add gdm-37-strndup.diff to ensure PAM_MAX_RESP_SIZE is honored.
 * Wed Feb 01 2012 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-38-bindtextdomaincodeset.diff	Mon Apr 09 01:04:34 2012 +0000
@@ -0,0 +1,10 @@
+--- gdm-2.30.7/daemon/main.c.orig	2012-03-23 13:52:17.581432411 +0800
++++ gdm-2.30.7/daemon/main.c	2012-03-23 13:52:18.509432457 +0800
+@@ -637,6 +637,7 @@
+ #endif
+ 
+         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
++        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+         textdomain (GETTEXT_PACKAGE);
+         setlocale (LC_ALL, "");
+