rpms/libX11/F-10 libX11-1.1.5-nn_NO.patch, NONE, 1.1 libX11.spec, 1.55, 1.56

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/libX11/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24793

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.5-nn_NO.patch 
Log Message:
* Tue Apr 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-4
- libX11-1.1.5-nn_NO.patch: add nn_NO.UTF-8  to compose.dir (#493556)



libX11-1.1.5-nn_NO.patch:

--- NEW FILE libX11-1.1.5-nn_NO.patch ---
>From ef5c446395aa30d7b1096a112e241a81c5b358e7 Mon Sep 17 00:00:00 2001
From: Xue Wei <Wei.Xue at Sun.COM>
Date: Fri, 20 Feb 2009 15:12:35 -0800
Subject: [PATCH] Add nn_NO.UTF-8 to compose.dir.pre for Norwegian Nynorsk

Sun bug 6691236: Swing applications dump core when locale is nn_NO.UTF-8
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6691236>

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 nls/compose.dir.pre |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index c5f11c8..22fb673 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -349,6 +349,7 @@ en_US.UTF-8/Compose:		mk_MK.UTF-8
 en_US.UTF-8/Compose:		ms_MY.UTF-8
 en_US.UTF-8/Compose:		nl_BE.UTF-8
 en_US.UTF-8/Compose:		nl_NL.UTF-8
+en_US.UTF-8/Compose:		nn_NO.UTF-8
 en_US.UTF-8/Compose:		no_NO.UTF-8
 en_US.UTF-8/Compose:		nb_NO.UTF-8
 en_US.UTF-8/Compose:		nr_ZA.UTF-8
-- 
1.6.3.rc1.2.gfa66a



Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/F-10/libX11.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libX11.spec	6 Apr 2009 01:11:33 -0000	1.55
+++ libX11.spec	28 Apr 2009 03:41:12 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,6 +22,8 @@ Patch5: libX11-1.1.4-XF86Suspend.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=491813
 Patch7: libX11-1.1.5-rm-long-composites.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=493556, patch from upstream
+Patch8: libX11-1.1.5-nn_NO.patch
 
 BuildRequires: pkgconfig
 # xproto >= 7.0.6 required
@@ -66,6 +68,7 @@ X.Org X11 libX11 development package
 %patch4 -p1 -b .keysyms
 %patch5 -p1 -b .xf86suspend
 %patch7 -p1 -b .rm-long-composites
+%patch8 -p1 -b .nn_NO
 
 %build
 %configure \
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Apr 28 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-4
+- libX11-1.1.5-nn_NO.patch: add nn_NO.UTF-8  to compose.dir (#493556)
+
 * Tue Mar 31 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.1.5-3
 - libX11-1.1.5-rm-long-composites.patch: Re-remove long compositions that
   override shorter (#491813).