rpms/libX11/devel libX11-1.1.99.2-compose-updates.patch, NONE, 1.1 libX11.spec, 1.55, 1.56

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28235

Modified Files:
	libX11.spec 
Added Files:
	libX11-1.1.99.2-compose-updates.patch 
Log Message:
* Wed Feb 04 2009 Adam Jackson <ajax at redhat.com> 1.1.99.2-4
- libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git)


libX11-1.1.99.2-compose-updates.patch:

--- NEW FILE libX11-1.1.99.2-compose-updates.patch ---
diff -up libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre
--- libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre.jx	2008-11-05 16:09:37.000000000 -0500
+++ libX11-1.1.99.2/nls/en_US.UTF-8/Compose.pre	2009-02-04 10:28:08.000000000 -0500
@@ -215,6 +215,9 @@ XCOMM Other symbols
 <Multi_key> <question> <exclam>         : "‽"   U203D # INTERROBANG
 <Multi_key> <exclam> <question>         : "‽"   U203D # INTERROBANG
 
+<Multi_key> <c> <c> <c> <p>             : "☭" U262D # HAMMER AND SICKLE
+<Multi_key> <less> <3>                  : "♥" U2665 # BLACK HEART SUIT
+
 XCOMM Part 2
 
 XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically


Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libX11.spec	2 Feb 2009 12:15:45 -0000	1.55
+++ libX11.spec	4 Feb 2009 15:33:44 -0000	1.56
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
 Version: 1.1.99.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -17,6 +17,8 @@
 Patch2: dont-forward-keycode-0.patch
 #http://lists.freedesktop.org/archives/xorg/2009-January/043133.html
 Patch3: libX11-1.1.99.2.hang.patch 
+# f052665394f3f0319e93a98f1d5d4ea287e1dd07
+Patch4: libX11-1.1.99.2-compose-updates.patch
 
 BuildRequires: pkgconfig autoconf automake libtool
 # xproto >= 7.0.6 required
@@ -59,6 +61,7 @@
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 %patch3 -p1 -b .dont-hang
+%patch4 -p1 -b .compose
 
 %build
 ./autogen.sh
@@ -120,6 +123,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Feb 04 2009 Adam Jackson <ajax at redhat.com> 1.1.99.2-4
+- libX11-1.1.99.2-compose-updates.patch: Update compose sequences (from git)
+
 * Mon Feb 02 2009 Caolán McNamara <caolanm at redhat.com> 1.1.99.2-3
 - Resolves: rhbz#477174 don't hang in OOo, acroread, ekiga, xine, etc.