[packages/xorg-lib-libX11] - updated to 1.6.2 - updated glibc-locale_sync patch
qboosh
qboosh at pld-linux.org
Tue Sep 10 19:10:18 CEST 2013
commit a5f0a5f62ddf6136fd6139cb3166bd2a205d62e6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Sep 10 19:10:17 2013 +0200
- updated to 1.6.2
- updated glibc-locale_sync patch
xorg-lib-libX11-glibc-locale_sync.patch | 16 ++++++++--------
xorg-lib-libX11.spec | 8 ++++++--
2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 8427a1a..9586503 100644
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -5,12 +5,12 @@
Summary: Core X11 protocol client library
Summary(pl.UTF-8): Podstawowa biblioteka kliencka protokołu X11
Name: xorg-lib-libX11
-Version: 1.6.1
+Version: 1.6.2
Release: 1
License: MIT
Group: X11/Libraries
Source0: http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
-# Source0-md5: bc5fc459ec25a50c5a7e27035b89e579
+# Source0-md5: c35d6ad95b06635a524579e88622fdb5
# sync locales and their encodings with glibc
Patch0: %{name}-glibc-locale_sync.patch
URL: http://xorg.freedesktop.org/
@@ -119,6 +119,9 @@ done
# for xorg-app-x11perf and possibly others
install -d $RPM_BUILD_ROOT%{_libdir}/X11
+# obsolete locale (rename to sr_RS / sr_ME?)
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/X11/locale/sr_CS.UTF-8
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -193,6 +196,7 @@ fi
%lang(ja) %{_datadir}/X11/locale/ja.JIS
%lang(ja) %{_datadir}/X11/locale/ja.SJIS
%lang(ja) %{_datadir}/X11/locale/ja_JP.UTF-8
+%lang(km) %{_datadir}/X11/locale/km_KH.UTF-8
%lang(ko) %{_datadir}/X11/locale/ko
%lang(ko) %{_datadir}/X11/locale/ko_KR.UTF-8
%lang(pt_BR) %{_datadir}/X11/locale/pt_BR.UTF-8
diff --git a/xorg-lib-libX11-glibc-locale_sync.patch b/xorg-lib-libX11-glibc-locale_sync.patch
index cb057ae..77bb09c 100644
--- a/xorg-lib-libX11-glibc-locale_sync.patch
+++ b/xorg-lib-libX11-glibc-locale_sync.patch
@@ -626,20 +626,20 @@
+}
+
+END XLC_XLOCALE
---- libX11-1.6.0/configure.ac.orig 2013-06-04 17:45:48.446641767 +0200
-+++ libX11-1.6.0/configure.ac 2013-06-04 17:47:07.899973444 +0200
-@@ -435,10 +435,10 @@
+--- libX11-1.6.2/configure.ac.orig 2013-09-10 18:19:33.575068931 +0200
++++ libX11-1.6.2/configure.ac 2013-09-10 18:20:48.635065783 +0200
+@@ -433,10 +433,10 @@
locales="\
am_ET.UTF-8 armscii-8 C el_GR.UTF-8 en_US.UTF-8 fi_FI.UTF-8 \
georgian-academy georgian-ps ibm-cp1133 iscii-dev isiri-3342 \
- iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
-+ iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 iso8859-16 \
++ iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 iso8859-16 \
iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \
iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\
-- ja.SJIS ko koi8-c koi8-r \
-+ ja.SJIS ko koi8-c koi8-r koi8-t \
- koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
- microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \
+- ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r koi8-u \
++ ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r koi8-t koi8-u \
+ ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 \
+ mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 sr_CS.UTF-8 \
tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \
--- libX11-1.6.0/nls/compose.dir.pre.orig 2013-06-04 04:21:16.000000000 +0200
+++ libX11-1.6.0/nls/compose.dir.pre 2013-06-04 20:13:46.073123395 +0200
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libX11.git/commitdiff/a5f0a5f62ddf6136fd6139cb3166bd2a205d62e6
More information about the pld-cvs-commit
mailing list