- some sr_* updates in glibc-locale-sync patch

- package iso8859-16 and koi8-t tables (coming from this patch)
- ensure proper .so man links are created

diff --git a/xorg-lib-libX11-glibc-locale_sync.patch b/xorg-lib-libX11-glibc-locale_sync.patch
index b965c876f22bd4c262bec23ea1fb77aa055917d0..57458a0e84abff54fb3c3dfd6847feb9ed4f9b5b 100644 (file)
--- a/xorg-lib-libX11-glibc-locale_sync.patch
+++ b/xorg-lib-libX11-glibc-locale_sync.patch
@@ -787,13 +787,15 @@
 +iso8859-1/Compose:            so_KE.ISO8859-1
 +iso8859-1/Compose:            so_SO.ISO8859-1
  iso8859-2/Compose:            sq_AL.ISO8859-2
- iso8859-2/Compose:            sr_CS.ISO8859-2
- iso8859-5/Compose:            sr_CS.ISO8859-5
+-iso8859-2/Compose:            sr_CS.ISO8859-2
+-iso8859-5/Compose:            sr_CS.ISO8859-5
 -iso8859-2/Compose:            sr_YU.ISO8859-2
 -microsoft-cp1251/Compose:     sr_YU.CP1251
-+XCOMM microsoft-cp1251/Compose:       sr_CS.CP1251
 +iso8859-5/Compose:            sr_ME.ISO8859-5
 +iso8859-16/Compose:           sr_ME.ISO8859-16
++iso8859-2/Compose:            sr_RS.ISO8859-2
++iso8859-5/Compose:            sr_RS.ISO8859-5
++XCOMM microsoft-cp1251/Compose:       sr_RS.CP1251
  iso8859-5/Compose:            sr_YU.ISO8859-5
  iso8859-1/Compose:            ss_ZA.ISO8859-1
  iso8859-1/Compose:            st_ZA.ISO8859-1
@@ -943,7 +945,7 @@
  pt_BR.UTF-8/Compose:          pt_BR.UTF-8
  en_US.UTF-8/Compose:          pt_PT.UTF-8
  en_US.UTF-8/Compose:          ro_RO.UTF-8
-@@ -434,13 +462,17 @@
+@@ -434,13 +462,16 @@
  en_US.UTF-8/Compose:          sh_BA.UTF-8
  en_US.UTF-8/Compose:          sh_YU.UTF-8
  en_US.UTF-8/Compose:          si_LK.UTF-8
@@ -955,7 +957,7 @@
 +en_US.UTF-8/Compose:          so_KE.UTF-8
 +en_US.UTF-8/Compose:          so_SO.UTF-8
  en_US.UTF-8/Compose:          sq_AL.UTF-8
- sr_CS.UTF-8/Compose:          sr_CS.UTF-8
+-sr_CS.UTF-8/Compose:          sr_CS.UTF-8
  en_US.UTF-8/Compose:          sr_ME.UTF-8
  en_US.UTF-8/Compose:          sr_RS.UTF-8
 -en_US.UTF-8/Compose:          sr_YU.UTF-8
@@ -1824,7 +1826,7 @@
  sr_ME:                                                sr_ME.UTF-8
  sr_ME.utf8:                                   sr_ME.UTF-8
 +sr@ije:                                               sr_ME.UTF-8
-+sr_CS@ije:                                    sr_CS.UTF-8
++sr_CS@ije:                                    sr_ME.UTF-8
  ss:                                                   ss_ZA.ISO8859-1
  ss_ZA:                                                ss_ZA.ISO8859-1
  ss_ZA.iso88591:                               ss_ZA.ISO8859-1

diff --git a/xorg-lib-libX11.spec b/xorg-lib-libX11.spec
index 17aab94d965ae1ee409f24682e146204e482babc..c0d64c7e8577cb9fc776451a3c4c1cc91842f4ea 100644 (file)
--- a/xorg-lib-libX11.spec
+++ b/xorg-lib-libX11.spec
@@ -20,6 +20,7 @@ BuildRequires:        cpp
 BuildRequires: libtool
 BuildRequires: libxcb-devel >= 1.2
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: sed >= 4.0
 BuildRequires: xmlto >= 0.0.22
 BuildRequires: xorg-lib-xtrans-devel
 BuildRequires: xorg-proto-inputproto-devel
@@ -84,6 +85,10 @@ Pakiet zawiera statyczną bibliotekę libX11.
 # https://bugs.freedesktop.org/show_bug.cgi?id=7415
 %patch0 -p1
 
+# support __libmansuffix__ and __filemansuffix__ with "x" suffix (per FHS 2.3)
+%{__sed} -i -e 's,\.so man__libmansuffix__/,.so man3/,' \
+           -e 's,\.so man__filemansuffix__/,.so man5/,' man/*.man
+
 %build
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -159,7 +164,7 @@ fi
 %{_datadir}/X11/locale/iso8859-13
 %{_datadir}/X11/locale/iso8859-14
 %{_datadir}/X11/locale/iso8859-15
-#%{_datadir}/X11/locale/iso8859-16
+%{_datadir}/X11/locale/iso8859-16
 %{_datadir}/X11/locale/iso8859-2
 %{_datadir}/X11/locale/iso8859-3
 %{_datadir}/X11/locale/iso8859-4
@@ -171,7 +176,7 @@ fi
 %{_datadir}/X11/locale/iso8859-9e
 %{_datadir}/X11/locale/koi8-c
 %{_datadir}/X11/locale/koi8-r
-#%{_datadir}/X11/locale/koi8-t
+%{_datadir}/X11/locale/koi8-t
 %{_datadir}/X11/locale/koi8-u
 %{_datadir}/X11/locale/microsoft-cp1251
 %{_datadir}/X11/locale/microsoft-cp1255
@@ -186,9 +191,7 @@ fi
 %lang(fi) %{_datadir}/X11/locale/fi_FI.UTF-8
 %lang(ja) %{_datadir}/X11/locale/ja
 %lang(ja) %{_datadir}/X11/locale/ja.JIS
-#%lang(ja) %{_datadir}/X11/locale/ja.S90
 %lang(ja) %{_datadir}/X11/locale/ja.SJIS
-#%lang(ja) %{_datadir}/X11/locale/ja.U90
 %lang(ja) %{_datadir}/X11/locale/ja_JP.UTF-8
 %lang(ko) %{_datadir}/X11/locale/ko
 %lang(ko) %{_datadir}/X11/locale/ko_KR.UTF-8