pool/libX11
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 439186 from X11:XOrg

Browse Source 
- u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch
  * refix cs_CZ.UTF-locale (boo#1008951, fdo#81875, fdo#98219)

- Run fdupes over at least the manpages

OBS-URL: https://build.opensuse.org/request/show/439186
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libX11?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2016-11-09 10:38:16 +00:00 committed by Git OBS Bridge
commit 0e574d6310
3 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libX11.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 8 11:04:56 UTC 2016 - sndirsch@suse.com
- u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch
* refix cs_CZ.UTF-locale (boo#1008951, fdo#81875, fdo#98219)
-------------------------------------------------------------------
Sat Nov 5 01:23:00 UTC 2016 - jengelh@inai.de
- Run fdupes over at least the manpages
-------------------------------------------------------------------
Sat Oct 29 00:10:49 UTC 2016 - tobias.johannes.klausmann@mni.thm.de

5
libX11.spec
View File

@ -28,6 +28,7 @@ Url: http://xorg.freedesktop.org/
#Git-Web: http://cgit.freedesktop.org/xorg/lib/libX11/
Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch0: u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch
# PATCH-FIX-UPSTREAM p_khmer-compose.diff fdo#48595 bnc#143348 -- required compose entries for Khmer
Patch7: p_khmer-compose.diff
# PATCH-FEATURE-UPSTREAM p_xlib_skip_ext_env.diff fdo#48588 bnc#167317 -- Add support for disabling extensions through environment variables
@ -38,6 +39,7 @@ Patch15: en-locales.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(inputproto)
@ -138,6 +140,7 @@ in libX11-6 and libX11-xcb1.
test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
#
%patch0 -p1
%patch7 -p0
%patch9 -p0
%patch15 -p0
@ -168,7 +171,7 @@ for i in *.UTF-8; do
done
popd
# fdupes %buildroot/%_prefix
%fdupes %buildroot/%_mandir
%post -n libX11-6 -p /sbin/ldconfig

66
u_nls-fix-handling-of-cs_CZ.UTF8_locale.patch Normal file
View File

@ -0,0 +1,66 @@
From 42c2e50c2da9c628337af412939eff3fb96a1f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <blueowl@centrum.cz>
Date: Mon, 10 Oct 2016 15:08:46 +0200
Subject: [PATCH 1/2] nls: Revert "Fix missing update in cf4d5989383a"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This was incorrect because cs_CZ.UTF-8 doesn't define XLC_LOCALE.
Related to bug https://bugs.freedesktop.org/show_bug.cgi?id=81875#c7
This reverts commit 33840a5465a2e5fecab520bfbdd2d1bd0a456f51.
Signed-off-by: Jiří Klimeš <blueowl@centrum.cz>
---
nls/locale.dir.pre | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index c4740a7..ccba036 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -302,7 +302,7 @@ en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8
-cs_CZ.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
+en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
--
2.10.0
From caff1f48dbf967d54c94b9bbb2fb039b7d079673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <blueowl@centrum.cz>
Date: Mon, 10 Oct 2016 15:12:07 +0200
Subject: [PATCH 2/2] nls: remove duplicated line for cs_CZ.UTF-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Related to bug https://bugs.freedesktop.org/show_bug.cgi?id=81875#c11
Signed-off-by: Jiří Klimeš <blueowl@centrum.cz>
---
nls/locale.dir.pre | 1 -
1 file changed, 1 deletion(-)
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index ccba036..92da876 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -304,7 +304,6 @@ en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8
-en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8
en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8
en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8
en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8
--
2.10.0