rpms/libX11
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix indic patch so it actually applies

Browse Source
This commit is contained in:
sandmann 2006-09-30 22:27:04 +00:00
parent 1b75bc640f
commit 68447c2b13
2 changed files with 27 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
libX11-nls-indic-locales-bug185376.patch
View File

@ -1,7 +1,6 @@
diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
--- nls/locale.alias.pre 2005-09-30 13:22:46.000000000 +0530
+++ nls/locale.alias.pre 2006-07-03 15:13:07.000000000 +0530
@@ -100,6 +100,9 @@ ar_TN: ar_TN.ISO8859-6
--- libX11-1.0.3/nls/locale.alias.pre.nls-indic-locales 2006-09-30 18:21:05.000000000 -0400
+++ libX11-1.0.3/nls/locale.alias.pre 2006-09-30 18:21:28.000000000 -0400
@@ -100,6 +100,9 @@
ar_TN.iso88596: ar_TN.ISO8859-6
ar_TN.ISO-8859-6: ar_TN.ISO8859-6
ar_TN.utf8: ar_TN.UTF-8
@ -11,7 +10,7 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
ar_YE: ar_YE.ISO8859-6
ar_YE.iso88596: ar_YE.ISO8859-6
ar_YE.ISO-8859-6: ar_YE.ISO8859-6
@@ -689,6 +692,9 @@ kl_GL.iso88591: kl_GL.ISO8859-1
@@ -690,6 +693,9 @@
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
@ -21,7 +20,7 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
ko: ko_KR.eucKR
ko_KR: ko_KR.eucKR
KO_KR: ko_KR.eucKR
@@ -751,6 +757,9 @@ mk_MK.microsoftcp1251: mk_MK.CP1251
@@ -752,6 +758,9 @@
mk_MK.microsoft-cp1251: mk_MK.CP1251
mk_MK.MICROSOFT-CP1251: mk_MK.CP1251
mk_MK.utf8: mk_MK.UTF-8
@ -31,7 +30,7 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
mr_IN: mr_IN.UTF-8
mr_IN.utf8: mr_IN.UTF-8
ms: ms_MY.ISO8859-1
@@ -830,6 +839,9 @@ oc_FR.ISO-8859-1: oc_FR.ISO8859-1
@@ -831,6 +840,9 @@
oc_FR.iso885915: oc_FR.ISO8859-15
oc_FR.ISO-8859-15: oc_FR.ISO8859-15
oc_FR@euro: oc_FR.ISO8859-15
@ -41,7 +40,7 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
pa_IN.utf8: pa_IN.UTF-8
pa_IN.UTF-8: pa_IN.UTF-8
pd: pd_US.ISO8859-1
@@ -979,6 +991,9 @@ ta: ta_IN.TSCII-0
@@ -1000,6 +1012,9 @@
ta_IN: ta_IN.TSCII-0
ta_IN.tscii: ta_IN.TSCII-0
ta_IN.tscii0: ta_IN.TSCII-0
@ -51,7 +50,7 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
tg: tg_TJ.KOI8-C
tg_TJ: tg_TJ.KOI8-C
tg_TJ.koi8c: tg_TJ.KOI8-C
@@ -1021,6 +1036,9 @@ uk_UA.microsoftcp1251: uk_UA.CP1251
@@ -1042,6 +1057,9 @@
uk_UA.microsoft-cp1251: uk_UA.CP1251
uk_UA.MICROSOFT-CP1251: uk_UA.CP1251
uk_UA.utf8: uk_UA.UTF-8
@ -61,35 +60,17 @@ diff -uNrp lib.orig/X11/nls/locale.alias.pre lib/X11/nls/locale.alias.pre
ur: ur_PK.CP1256
ur_PK: ur_PK.CP1256
ur_PK.cp1256: ur_PK.CP1256
diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
--- nls/locale.dir.pre 2005-09-30 13:22:46.000000000 +0530
+++ nls/locale.dir.pre 2006-07-03 15:15:48.000000000 +0530
@@ -198,7 +198,7 @@ iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
koi8-r/XLC_LOCALE: ru_RU.KOI8-R
koi8-u/XLC_LOCALE: ru_UA.KOI8-U
-iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
+iso8859-1/XLC_LOCALE: rw_RW.ISO8859-1
iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2
iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2
iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2
@@ -261,13 +261,14 @@ en_US.UTF-8/XLC_LOCALE: ar_LB.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_LY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_MA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_OM.UTF-8
-en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
+en_US.UTF-8/XLC_LOCALE: bs_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_QA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SA.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SD.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_SY.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
+en_US.UTF-8/XLC_LOCALE: as_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
en_US.UTF-8/XLC_LOCALE: a3_AZ.UTF-8
en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8
@@ -348,6 +349,7 @@ en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
--- libX11-1.0.3/nls/locale.dir.pre.nls-indic-locales 2006-09-30 18:21:22.000000000 -0400
+++ libX11-1.0.3/nls/locale.dir.pre 2006-09-30 18:22:23.000000000 -0400
@@ -27,6 +27,7 @@
iso8859-6/XLC_LOCALE: ar_SY.ISO8859-6
iso8859-6/XLC_LOCALE: ar_TN.ISO8859-6
iso8859-6/XLC_LOCALE: ar_YE.ISO8859-6
+iso8859-6/XLC_LOCALE: as_IN.ISO8859-6
iso8859-9e/XLC_LOCALE: az_AZ.ISO8859-9E
koi8-c/XLC_LOCALE: az_AZ.KOI8-C
iso8859-5/XLC_LOCALE: be_BY.ISO8859-5
@@ -350,6 +351,7 @@
ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8
en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
@ -97,7 +78,7 @@ diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
@@ -356,6 +358,7 @@ en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
@@ -358,6 +360,7 @@
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
@ -105,7 +86,7 @@ diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: mr_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ms_MY.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
@@ -367,6 +370,7 @@ en_US.UTF-8/XLC_LOCALE: nr_ZA.UTF-8
@@ -369,6 +372,7 @@
en_US.UTF-8/XLC_LOCALE: nso_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: ny_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: oc_FR.UTF-8
@ -113,16 +94,7 @@ diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: pa_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: pd_DE.UTF-8
en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
@@ -378,7 +382,7 @@ en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
-en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
+en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
en_US.UTF-8/XLC_LOCALE: si_LK.UTF-8
@@ -391,6 +395,7 @@ en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8
@@ -394,6 +398,7 @@
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8
en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8
@ -130,7 +102,7 @@ diff -uNrp lib.orig/X11/nls/locale.dir.pre lib/X11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
@@ -401,6 +406,7 @@ en_US.UTF-8/XLC_LOCALE: tr_TR.UTF-8
@@ -404,6 +409,7 @@
en_US.UTF-8/XLC_LOCALE: ts_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: tt_RU.UTF-8
en_US.UTF-8/XLC_LOCALE: uk_UA.UTF-8

5
libX11.spec
View File

@ -52,7 +52,7 @@ X.Org X11 libX11 development package
# of war with these things. It's easier to leave this here than to try and
# find it later.
#%patch0 -p0 -b .datadir-locale-dir-fix
%patch1 -p0 -b .nls-indic-locales-bug185376
%patch1 -p1 -b .nls-indic-locales-bug185376
%patch2 -p1 -b .dont-forward-keycode-0
# Disable static library creation by default.
@ -246,6 +246,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3x*
%changelog
* Sat Sep 30 2006 Soren Sandmann <sandmann@redhat.com> 1.0.3-4.fc6
- Fix patch so it actually applies. (#208508)
* Sat Sep 30 2006 Soren Sandmann <sandmann@redhat.com> 1.0.3-4.fc6
- Fix typos in patch for indic locales (#208580)