Accepting request 227308 from X11:XOrg

- U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch
  * fix typo in en_US Compose file (s/dead_actute/dead_acute/)
    (bnc#869333)

OBS-URL: https://build.opensuse.org/request/show/227308
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libX11?expand=0&rev=15
This commit is contained in:
Stephan Kulow 2014-03-27 05:14:31 +00:00 committed by Git OBS Bridge
commit 87ba051de9
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Tue, 17 Sep 2013 12:50:42 -0400
Subject: [PATCH] nls/en_US.UTF-8/Compose.pre: Fix typo.
Fix typo added in 215ce6a67863, s/actute/acute/.
Fixes bug #69476. Reported by Jean Krohn.
Signed-off-by: James Cloos <cloos@jhcloos.com>
---
nls/en_US.UTF-8/Compose.pre | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index a741332..7314d7f 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -743,7 +743,7 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
--
1.8.4.5

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Mar 24 12:47:59 UTC 2014 - sndirsch@suse.com
- U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch
* fix typo in en_US Compose file (s/dead_actute/dead_acute/)
(bnc#869333)
-------------------------------------------------------------------
Mon Sep 9 13:56:14 UTC 2013 - tobias.johannes.klausmann@mni.thm.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libX11
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -33,6 +33,7 @@ Patch7: p_khmer-compose.diff
Patch9: p_xlib_skip_ext_env.diff
# PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales
Patch15: en-locales.diff
Patch16: U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.60
@ -140,6 +141,7 @@ test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
%patch7 -p0
%patch9 -p0
%patch15 -p0
%patch16 -p1
%build
# Got patches which change auto*files