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

- Today's git snapshot

Browse Source 
- libX11-1.2.1-indic.patch: Drop.
This commit is contained in:
Peter Hutterer 2009-07-12 07:11:35 +00:00
parent a30e4f357c
commit 7fbd223652
6 changed files with 34 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
libX11-1.2.1.tar.bz2
libX11-20090712.tar.bz2

1
commitid Normal file
View File

@ -0,0 +1 @@
554f755e5545f63d3c8f299297927238da155773

248
libX11-1.2.1-indic.patch
View File

@ -1,248 +0,0 @@
From 4a08a3dfbda497b2be46e3e5fe6b777815ea27f9 Mon Sep 17 00:00:00 2001
From: parag <pnemade@redhat.com>
Date: Tue, 5 May 2009 16:50:47 +0530
Subject: [PATCH] libX11: Add new Indic language information to nls directory files. #21560
Signed-off-by: parag <pnemade@redhat.com>
---
nls/compose.dir.pre | 16 ++++++++++++++++
nls/locale.alias.pre | 26 ++++++++++++++++++++++++++
nls/locale.dir.pre | 12 +++++++++++-
3 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index f44a1ed..2a4123e 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -244,6 +244,7 @@ en_US.UTF-8/Compose: ar_AA.UTF-8
en_US.UTF-8/Compose: ar_BH.UTF-8
en_US.UTF-8/Compose: ar_DZ.UTF-8
en_US.UTF-8/Compose: ar_EG.UTF-8
+en_US.UTF-8/Compose: ar_IN.UTF-8
en_US.UTF-8/Compose: ar_IQ.UTF-8
en_US.UTF-8/Compose: ar_JO.UTF-8
en_US.UTF-8/Compose: ar_KW.UTF-8
@@ -255,6 +256,7 @@ en_US.UTF-8/Compose: ar_QA.UTF-8
en_US.UTF-8/Compose: ar_SA.UTF-8
en_US.UTF-8/Compose: ar_TN.UTF-8
en_US.UTF-8/Compose: ar_YE.UTF-8
+en_US.UTF-8/Compose: bo_IN.UTF-8
en_US.UTF-8/Compose: bs_BA.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
en_US.UTF-8/Compose: a3_AZ.UTF-8
@@ -328,6 +330,7 @@ en_US.UTF-8/Compose: gu_IN.UTF-8
en_US.UTF-8/Compose: gv_GB.UTF-8
en_US.UTF-8/Compose: he_IL.UTF-8
en_US.UTF-8/Compose: hi_IN.UTF-8
+en_US.UTF-8/Compose: hne_IN.UTF-8
en_US.UTF-8/Compose: hr_HR.UTF-8
en_US.UTF-8/Compose: hu_HU.UTF-8
en_US.UTF-8/Compose: hy_AM.UTF-8
@@ -340,14 +343,20 @@ en_US.UTF-8/Compose: ja_JP.UTF-8
en_US.UTF-8/Compose: ka_GE.UTF-8
en_US.UTF-8/Compose: kl_GL.UTF-8
en_US.UTF-8/Compose: kk_KZ.UTF-8
+en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: ko_KR.UTF-8
+en_US.UTF-8/Compose: ks_IN.UTF-8
+en_US.UTF-8/Compose: ks_IN@devanagari.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
en_US.UTF-8/Compose: lo_LA.UTF-8
en_US.UTF-8/Compose: lt_LT.UTF-8
en_US.UTF-8/Compose: lv_LV.UTF-8
+en_US.UTF-8/Compose: mai_IN.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
+en_US.UTF-8/Compose: ml_IN.UTF-8
+en_US.UTF-8/Compose: mr_IN.UTF-8
en_US.UTF-8/Compose: ms_MY.UTF-8
en_US.UTF-8/Compose: mt_MT.UTF-8
en_US.UTF-8/Compose: nl_BE.UTF-8
@@ -359,6 +368,7 @@ en_US.UTF-8/Compose: nr_ZA.UTF-8
en_US.UTF-8/Compose: nso_ZA.UTF-8
en_US.UTF-8/Compose: ny_NO.UTF-8
en_US.UTF-8/Compose: oc_FR.UTF-8
+en_US.UTF-8/Compose: or_IN.UTF-8
en_US.UTF-8/Compose: pa_IN.UTF-8
en_US.UTF-8/Compose: pd_DE.UTF-8
en_US.UTF-8/Compose: pd_US.UTF-8
@@ -371,6 +381,9 @@ en_US.UTF-8/Compose: ro_RO.UTF-8
en_US.UTF-8/Compose: ru_RU.UTF-8
en_US.UTF-8/Compose: ru_UA.UTF-8
en_US.UTF-8/Compose: rw_RW.UTF-8
+en_US.UTF-8/Compose: sa_IN.UTF-8
+en_US.UTF-8/Compose: sd_IN.UTF-8
+en_US.UTF-8/Compose: sd_IN@devanagari.UTF-8
en_US.UTF-8/Compose: sh_BA.UTF-8
en_US.UTF-8/Compose: si_LK.UTF-8
en_US.UTF-8/Compose: sk_SK.UTF-8
@@ -385,6 +398,7 @@ en_US.UTF-8/Compose: st_ZA.UTF-8
en_US.UTF-8/Compose: sv_FI.UTF-8
en_US.UTF-8/Compose: sv_SE.UTF-8
en_US.UTF-8/Compose: ta_IN.UTF-8
+en_US.UTF-8/Compose: te_IN.UTF-8
en_US.UTF-8/Compose: tg_TJ.UTF-8
en_US.UTF-8/Compose: th_TH.UTF-8
en_US.UTF-8/Compose: tl_PH.UTF-8
@@ -403,3 +417,5 @@ en_US.UTF-8/Compose: xh_ZA.UTF-8
en_US.UTF-8/Compose: zh_TW.UTF-8
en_US.UTF-8/Compose: zu_ZA.UTF-8
en_US.UTF-8/Compose: bs_BA.UTF-8
+en_US.UTF-8/Compose: ne_NP.UTF-8
+
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index 5877f82..452bd18 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -51,6 +51,8 @@ ar_EG: ar_EG.ISO8859-6
ar_EG.iso88596: ar_EG.ISO8859-6
ar_EG.ISO-8859-6: ar_EG.ISO8859-6
ar_EG.utf8: ar_EG.UTF-8
+ar_IN.utf8: ar_IN.UTF-8
+ar_IN.UTF-8: ar_IN.UTF-8
ar_IQ: ar_IQ.ISO8859-6
ar_IQ.iso88596: ar_IQ.ISO8859-6
ar_IQ.ISO-8859-6: ar_IQ.ISO8859-6
@@ -132,6 +134,8 @@ bg_BG.koi8r: bg_BG.KOI8-R
be_BG.utf8: bg_BG.UTF-8
bn_IN.utf8: bn_IN.UTF-8
bn_IN.UTF-8: bn_IN.UTF-8
+bo_IN.utf8: bo_IN.UTF-8
+bo_IN.UTF-8: bo_IN.UTF-8
br: br_FR.ISO8859-1
br_FR: br_FR.ISO8859-1
br_FR.iso88591: br_FR.ISO8859-1
@@ -640,6 +644,9 @@ HI_IN: hi_IN.ISCII-DEV
hi_IN.isciidev: hi_IN.ISCII-DEV
hi_IN.utf8: hi_IN.UTF-8
HI_IN.UTF-8: hi_IN.UTF-8
+hne: hne_IN.UTF-8
+hne_IN.utf8: hne_IN.UTF-8
+hne_IN.UTF-8: hne_IN.UTF-8
hr: hr_HR.ISO8859-2
hr_HR: hr_HR.ISO8859-2
hr_HR.iso88592: hr_HR.ISO8859-2
@@ -746,6 +753,12 @@ ko_KR.euc: ko_KR.eucKR
ko_KR.euckr: ko_KR.eucKR
ko_KR.utf8: ko_KR.UTF-8
KO_KR.UTF-8: ko_KR.UTF-8
+ks: ks_IN.UTF-8
+ks_IN.utf8: ks_IN.UTF-8
+ks_IN.UTF-8: ks_IN.UTF-8
+ks_IN@devanagari: ks_IN@devanagari.UTF-8
+ks_IN@devanagari.utf8: ks_IN@devanagari.UTF-8
+ks_IN@devanagari.UTF-8: ks_IN@devanagari.UTF-8
kw: kw_GB.ISO8859-1
kw_GB: kw_GB.ISO8859-1
kw_GB.iso88591: kw_GB.ISO8859-1
@@ -787,6 +800,9 @@ lv_LV.iso885913: lv_LV.ISO8859-13
lv_LV.ISO-8859-13: lv_LV.ISO8859-13
lv_LV.ISO_8859-13: lv_LV.ISO8859-13
lv_LV.utf8: lv_LV.UTF-8
+mai: mai_IN.UTF-8
+mai_IN.utf8: mai_IN.UTF-8
+mai_IN.UTF-8: mai_IN.UTF-8
mi: mi_NZ.ISO8859-1
mi_NZ: mi_NZ.ISO8859-1
mi_NZ.iso88591: mi_NZ.ISO8859-1
@@ -802,8 +818,10 @@ mk_MK.utf8: mk_MK.UTF-8
ml: ml_IN.UTF-8
ml_IN.utf8: ml_IN.UTF-8
ml_IN.UTF-8: ml_IN.UTF-8
+mr: mr_IN.UTF-8
mr_IN: mr_IN.UTF-8
mr_IN.utf8: mr_IN.UTF-8
+mr_IN.UTF-8: mr_IN.UTF-8
ms: ms_MY.ISO8859-1
ms_MY: ms_MY.ISO8859-1
ms_MY.iso88591: ms_MY.ISO8859-1
@@ -818,6 +836,8 @@ nb_NO.iso88591: nb_NO.ISO8859-1
nb_NO.ISO-8859-1: nb_NO.ISO8859-1
nb_NO.iso885915: nb_NO.ISO8859-15
nb_NO.ISO-8859-15: nb_NO.ISO8859-15
+ne_NP.utf8: ne_NP.UTF-8
+ne_NP.UTF-8: ne_NP.UTF-8
nl: nl_NL.ISO8859-1
nl.ISO8859-15: nl_NL.ISO8859-15
nl_BE: nl_BE.ISO8859-1
@@ -964,6 +984,12 @@ rw_RW: rw_RW.ISO8859-1
rw_RW.iso8859-1: rw_RW.ISO8859-1
rw_RW.ISO-8859-1: rw_RW.ISO8859-1
rw_RW.utf8: rw_RW.UTF-8
+sd: sd_IN.UTF-8
+sd_IN.utf8: sd_IN.UTF-8
+sd_IN.UTF-8: sd_INUTF-8
+sd: sd_IN@devanagari.UTF-8
+sd_IN@devanagari.utf8: sd_IN@devanagari.UTF-8
+sd_IN@devanagari.UTF-8: sd_IN@devanagari.UTF-8
se_NO: se_NO.UTF-8
se_NO.utf8: se_NO.UTF-8
XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr).
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index dff0581..ecc2adf 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -260,6 +260,7 @@ en_US.UTF-8/XLC_LOCALE: ar_AE.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
+en_US.UTF-8/XLC_LOCALE: ar_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
@@ -281,6 +282,7 @@ en_US.UTF-8/XLC_LOCALE: be_BY.UTF-8
en_US.UTF-8/XLC_LOCALE: bg_BG.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: bo_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
@@ -350,6 +352,7 @@ en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
en_US.UTF-8/XLC_LOCALE: he_IL.UTF-8
en_US.UTF-8/XLC_LOCALE: hi_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: hne_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: hr_HR.UTF-8
en_US.UTF-8/XLC_LOCALE: hu_HU.UTF-8
en_US.UTF-8/XLC_LOCALE: hy_AM.UTF-8
@@ -363,12 +366,15 @@ en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
en_US.UTF-8/XLC_LOCALE: kk_KZ.UTF-8
en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: ks_IN@devanagari.UTF-8
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
en_US.UTF-8/XLC_LOCALE: lo_LA.UTF-8
en_US.UTF-8/XLC_LOCALE: lt_LT.UTF-8
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
+en_US.UTF-8/XLC_LOCALE: mai_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
@@ -396,7 +402,10 @@ en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
ru_RU.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: sa_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
+en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_BA.UTF-8
en_US.UTF-8/XLC_LOCALE: sh_YU.UTF-8
@@ -432,6 +441,7 @@ en_US.UTF-8/XLC_LOCALE: vi_VN.UTF-8
en_US.UTF-8/XLC_LOCALE: wa_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: xh_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: yi_US.UTF-8
+en_US.UTF-8/XLC_LOCALE: ne_NP.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_CN.UTF-8
zh_HK.UTF-8/XLC_LOCALE: zh_HK.UTF-8
zh_CN.UTF-8/XLC_LOCALE: zh_SG.UTF-8
--
1.6.3.rc1.2.g0164.dirty

21
libX11.spec
View File

@ -1,18 +1,21 @@
%define tarball libX11
%define gitdate 20090712
Summary: X.Org X11 libX11 runtime library
Name: libX11
Version: 1.2.1
Release: 3%{?dist}
Version: 1.2.99
Release: 1.%{gitdate}%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
#Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2
Source0: %{tarball}-%{gitdate}.tar.bz2
Source1: make-git-snapshot.sh
Patch2: dont-forward-keycode-0.patch
# #497971, patch from upstream, drop with 1.2.2
Patch3: libX11-1.2.1-indic.patch
BuildRequires: pkgconfig autoconf automake libtool
# xproto >= 7.0.6 required
@ -51,9 +54,9 @@ Requires: pkgconfig
X.Org X11 libX11 development package
%prep
%setup -q
#%setup -q
%setup -q -n %{tarball}-%{gitdate}
%patch2 -p1 -b .dont-forward-keycode-0
%patch3 -p1 -b .indic
%build
# sodding libtool
@ -118,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3*
%changelog
* Sun Jul 12 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.2.99-1.20090712
- Today's git snapshot
- libX11-1.2.1-indic.patch: Drop.
* Mon Jul 06 2009 Adam Jackson <ajax@redhat.com> 1.2.1-3
- -common subpackage

17
make-git-snapshot.sh Executable file
View File

@ -0,0 +1,17 @@
#!/bin/sh
DIRNAME=libX11-$( date +%Y%m%d )
rm -rf $DIRNAME
git clone git://git.freedesktop.org/git/xorg/lib/libX11 $DIRNAME
cd $DIRNAME
if [ -z "$1" ]; then
git log | head -1
else
git checkout $1
fi
git log | head -1 | awk '{ print $2 }' > ../commitid
git repack -a -d
cd ..
tar jcf $DIRNAME.tar.bz2 $DIRNAME
rm -rf $DIRNAME

2
sources
View File

@ -1 +1 @@
2f2beb98e71f397e1209beaca4e97cb1 libX11-1.2.1.tar.bz2
59e23f040427385c116f03ece2bdf880 libX11-20090712.tar.bz2