From 2a042bc0f70e2bb6f7c56b7c2adab26c535540d1 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Wed, 1 Feb 2012 09:52:38 -0700
Subject: [PATCH] Fix month abbreviations for zh_CN (#657588)

---
 glibc-rh657588.patch | 32 ++++++++++++++++++++++++++++++++
 glibc.spec           |  4 ++++
 2 files changed, 36 insertions(+)
 create mode 100644 glibc-rh657588.patch

diff --git a/glibc-rh657588.patch b/glibc-rh657588.patch
new file mode 100644
index 0000000..f5895a3
--- /dev/null
+++ b/glibc-rh657588.patch
@@ -0,0 +1,32 @@
+diff -rup a/localedata/locales/pt_PT b/localedata/locales/pt_PT
+--- a/localedata/locales/pt_PT	2006-07-30 16:19:43.000000000 -0600
++++ b/localedata/locales/pt_PT	2012-01-30 20:54:30.530231851 -0700
+@@ -65,7 +65,7 @@ END LC_MESSAGES
+ LC_MONETARY
+ int_curr_symbol           "<U0045><U0055><U0052><U0020>"
+ currency_symbol           "<U20AC>"
+-mon_decimal_point         "<U0024>"
++mon_decimal_point         "<U002C>"
+ mon_thousands_sep         "<U002E>"
+ mon_grouping              3;3
+ positive_sign             ""
+diff -rup a/localedata/locales/zh_CN b/localedata/locales/zh_CN
+--- a/localedata/locales/zh_CN	2006-07-30 16:19:43.000000000 -0600
++++ b/localedata/locales/zh_CN	2012-01-30 21:24:46.905115483 -0700
+@@ -108,11 +108,11 @@ day 	"<U661F><U671F><U65E5>";/
+ 	"<U661F><U671F><U4E94>";/
+ 	"<U661F><U671F><U516D>"
+ 
+-abmon	"<U0020><U0031><U6708>";"<U0020><U0032><U6708>";/
+-	"<U0020><U0033><U6708>";"<U0020><U0034><U6708>";/
+-	"<U0020><U0035><U6708>";"<U0020><U0036><U6708>";/
+-	"<U0020><U0037><U6708>";"<U0020><U0038><U6708>";/
+-	"<U0020><U0039><U6708>";"<U0031><U0030><U6708>";/
++abmon	"<U0031><U6708>";"<U0032><U6708>";/
++	"<U0033><U6708>";"<U0034><U6708>";/
++	"<U0035><U6708>";"<U0036><U6708>";/
++	"<U0037><U6708>";"<U0038><U6708>";/
++	"<U0039><U6708>";"<U0031><U0030><U6708>";/
+ 	"<U0031><U0031><U6708>";"<U0031><U0032><U6708>"
+ 
+ mon	"<U4E00><U6708>";"<U4E8C><U6708>";"<U4E09><U6708>";/
diff --git a/glibc.spec b/glibc.spec
index b005deb..155cc7b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -67,6 +67,8 @@ Patch15: %{name}-sw13618.patch
 # Fix bogus sorting code which was copied from dl-deps.
 Patch16: %{name}-sw13618-2.patch
 Patch17: %{name}-rh783979.patch
+# Needs to go upstream
+Patch18: %{name}-rh657588.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
@@ -302,6 +304,7 @@ rm -rf %{glibcportsdir}
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1157,6 +1160,7 @@ rm -f *.filelist*
 * Wed Feb 1 2012 Jeff Law <law@redhat.com> - 2.15-8
   - Prevent erroneous inline optimization of initfini.s on PowerPC64 (#783979)
   - Use upstream variant of fix for 740506.
+  - Fix month abbreviations for zh_CN (#657588)
 
 * Sun Jan 29 2012 Jeff Law <law@redhat.com> - 2.15-7
   - Sort objects before relocations (sw#13618)