From e8db5b40639c96b5170d11867cf5cb9f385bdde9 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Thu, 26 Jan 2012 11:03:17 -0700
Subject: [PATCH]   - Add aliases for ISO-10646-UCS-2 (#697421)

---
 glibc-rh697421.patch | 10 ++++++++++
 glibc.spec           |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 glibc-rh697421.patch

diff --git a/glibc-rh697421.patch b/glibc-rh697421.patch
new file mode 100644
index 0000000..961c805
--- /dev/null
+++ b/glibc-rh697421.patch
@@ -0,0 +1,10 @@
+diff -rup a/iconvdata/gconv-modules b/iconvdata/gconv-modules
+--- a/iconvdata/gconv-modules	2010-05-04 05:27:23.000000000 -0600
++++ b/iconvdata/gconv-modules	2012-01-26 10:58:24.181895489 -0700
+@@ -1954,3 +1954,6 @@ alias	HPGREEK8//		HP-GREEK8//
+ alias	OSF10010004//		HP-GREEK8//
+ module	HP-GREEK8//		INTERNAL		HP-GREEK8	1
+ module	INTERNAL		HP-GREEK8//		HP-GREEK8	1
++
++alias	ISO-10646-UCS-2//	UNICODE//
++alias	ISO-10646-UCS-2//	ISO-10646/UTF8/
diff --git a/glibc.spec b/glibc.spec
index 2062e34..0cf4c90 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 5%{?dist}
+Release: 6%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -61,6 +61,7 @@ Patch10: %{name}-rh784402.patch
 Patch11: %{name}-rh622499.patch
 # Depends on systemtap infrastructure, so can't go upstream
 Patch12: %{name}-rh179072.patch
+Patch13: %{name}-rh697421.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
@@ -291,6 +292,7 @@ rm -rf %{glibcportsdir}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1143,6 +1145,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jan 26 2012 Jeff Law <law@redhat.com> - 2.15-6
+  - Add aliases for ISO-10646-UCS-2 (#697421)
+
 * Tue Jan 24 2012 Jeff Law <law@redhat.com> - 2.15-4
   - Update ports from master.
   - Fix first workday/weekday for it_IT (#622499)