rpms/gdm/F-9 zh.patch,NONE,1.1 gdm.spec,1.384,1.385

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gdm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452

Modified Files:
	gdm.spec 
Added Files:
	zh.patch 
Log Message:
Fix Chinese date/time display


zh.patch:

--- NEW FILE zh.patch ---
diff -up ./gdm-2.22.0/po/zh_CN.po.orig ./gdm-2.22.0/po/zh_CN.po
--- ./gdm-2.22.0/po/zh_CN.po.orig	2008-05-09 10:23:29.000000000 +1000
+++ ./gdm-2.22.0/po/zh_CN.po	2008-05-09 10:24:05.000000000 +1000
@@ -467,7 +467,7 @@ msgstr "%l:%M %p"
 #.
 #: ../gui/simple-greeter/gdm-greeter-login-window.c:713
 msgid "%a %b %e"
-msgstr "%b月%e日 星期%a"
+msgstr "%b%e日 星期%a"
 
 #. translators: reverse the order of these arguments
 #. *              if the time should come before the



Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -r1.384 -r1.385
--- gdm.spec	6 May 2008 18:35:14 -0000	1.384
+++ gdm.spec	9 May 2008 16:44:45 -0000	1.385
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -77,6 +77,8 @@
 Requires: audit-libs >= %{libauditver}
 Patch1: xkb-groups.patch
 Patch2: gdm-silence-debugging.patch
+# Fix Chinese date/time display (fixed in upstream svn)
+Patch3: zh.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -98,6 +100,7 @@
 %setup -q
 %patch1 -p1 -b .xkb-groups
 %patch2 -p1 -b .silence-debugging
+%patch3 -p1 -b .chinese-time
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -295,6 +298,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri May  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.22.0-3
+- Fix Chinese date/time display (#445664)
+
 * Tue May  6 2008 Jon McCann <jmccann at redhat.com> - 1:2.22.0-2
 - Silence debugging output when --debug isn't used