From f77c23237faedcc77b4e5ec06349be44e603aeb761c61d0ace4b73620eac8c5c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Mar 2014 12:59:04 +0000 Subject: [PATCH] - 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/package/show/X11:XOrg/libX11?expand=0&rev=26 --- U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch | 30 ++++++++++++++++++++ libX11.changes | 7 +++++ libX11.spec | 4 ++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch diff --git a/U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch b/U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch new file mode 100644 index 0000000..2ba7513 --- /dev/null +++ b/U_nls-en_US.UTF-8-Compose.pre-Fix-typo.patch @@ -0,0 +1,30 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos +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 +--- + 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 + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +- : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 ++ : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +-- +1.8.4.5 + diff --git a/libX11.changes b/libX11.changes index 31b6c09..a05a3cb 100644 --- a/libX11.changes +++ b/libX11.changes @@ -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 diff --git a/libX11.spec b/libX11.spec index 7ba40de..8355ee6 100644 --- a/libX11.spec +++ b/libX11.spec @@ -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