Peter Hutterer
parent
001faade5e
commit
457568e3c9
@ -0,0 +1,36 @@
|
|||||||
|
From 3f7d33a91dbb8f3ba27d824761364b24e8dac70b Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Sergey V. Udaltsov" <svu@gnome.org>
|
||||||
|
Date: Fri, 1 Feb 2013 00:40:51 +0000
|
||||||
|
Subject: [PATCH] English Mali layouts have English language assigned to them
|
||||||
|
|
||||||
|
---
|
||||||
|
rules/base.xml.in | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
||||||
|
index 7239c09..19380fa 100644
|
||||||
|
--- a/rules/base.xml.in
|
||||||
|
+++ b/rules/base.xml.in
|
||||||
|
@@ -5377,6 +5377,9 @@
|
||||||
|
<!-- Keyboard indicator for English layouts -->
|
||||||
|
<_shortDescription>en</_shortDescription>
|
||||||
|
<_description>English (Mali, US Macintosh)</_description>
|
||||||
|
+ <languageList>
|
||||||
|
+ <iso639Id>eng</iso639Id>
|
||||||
|
+ </languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
<variant>
|
||||||
|
@@ -5385,6 +5388,9 @@
|
||||||
|
<!-- Keyboard indicator for English layouts -->
|
||||||
|
<_shortDescription>en</_shortDescription>
|
||||||
|
<_description>English (Mali, US international)</_description>
|
||||||
|
+ <languageList>
|
||||||
|
+ <iso639Id>eng</iso639Id>
|
||||||
|
+ </languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
</variantList>
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
56
0001-Fixing-ISO-codes.patch
Normal file
56
0001-Fixing-ISO-codes.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From ffed69dca21ada0671aa6da3f4d11c27318bafce Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Sergey V. Udaltsov" <svu@gnome.org>
|
||||||
|
Date: Fri, 1 Feb 2013 00:33:50 +0000
|
||||||
|
Subject: [PATCH] Fixing ISO codes
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=59840
|
||||||
|
---
|
||||||
|
rules/base.xml.in | 11 ++++++++---
|
||||||
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
||||||
|
index f5de8ae..7239c09 100644
|
||||||
|
--- a/rules/base.xml.in
|
||||||
|
+++ b/rules/base.xml.in
|
||||||
|
@@ -2495,7 +2495,7 @@
|
||||||
|
<_shortDescription>hr</_shortDescription>
|
||||||
|
<_description>Croatian</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>scr</iso639Id>
|
||||||
|
+ <iso639Id>hrv</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
<variantList>
|
||||||
|
@@ -3887,7 +3887,7 @@
|
||||||
|
<_shortDescription>mn</_shortDescription>
|
||||||
|
<_description>Mongolian</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>mng</iso639Id>
|
||||||
|
+ <iso639Id>mon</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
<variantList/>
|
||||||
|
@@ -4877,7 +4877,7 @@
|
||||||
|
<_shortDescription>zh</_shortDescription>
|
||||||
|
<_description>Taiwanese</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>trv</iso639Id>
|
||||||
|
+ <iso639Id>fox</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
<variantList>
|
||||||
|
@@ -4897,6 +4897,11 @@
|
||||||
|
<iso639Id>ssf</iso639Id>
|
||||||
|
<iso639Id>tao</iso639Id>
|
||||||
|
<iso639Id>tsu</iso639Id>
|
||||||
|
+ <iso639Id>trv</iso639Id>
|
||||||
|
+ <iso639Id>xnb</iso639Id>
|
||||||
|
+ <iso639Id>sxr</iso639Id>
|
||||||
|
+ <iso639Id>uun</iso639Id>
|
||||||
|
+ <iso639Id>fos</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
35
0001-Fixing-wrong-iso639-3-codes.patch
Normal file
35
0001-Fixing-wrong-iso639-3-codes.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 868655ca4069a724863dd22f72cf65673b14d9d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Sergey V. Udaltsov" <svu@gnome.org>
|
||||||
|
Date: Fri, 1 Feb 2013 00:32:16 +0000
|
||||||
|
Subject: [PATCH] Fixing wrong iso639-3 codes
|
||||||
|
|
||||||
|
https://bugs.freedesktop.org/show_bug.cgi?id=59840
|
||||||
|
---
|
||||||
|
rules/base.xml.in | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
||||||
|
index fd9cc27..f5de8ae 100644
|
||||||
|
--- a/rules/base.xml.in
|
||||||
|
+++ b/rules/base.xml.in
|
||||||
|
@@ -5174,7 +5174,7 @@
|
||||||
|
<_shortDescription>sd</_shortDescription>
|
||||||
|
<_description>Sindhi</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>sd</iso639Id>
|
||||||
|
+ <iso639Id>snd</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
@@ -5362,7 +5362,7 @@
|
||||||
|
<_shortDescription>fr</_shortDescription>
|
||||||
|
<_description>French (Mali, alternative)</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>fr</iso639Id>
|
||||||
|
+ <iso639Id>fra</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
25
0001-fr-fra-ISO-639.patch
Normal file
25
0001-fr-fra-ISO-639.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From b4be67b48fb11989f1824dd0b1c8c399430162b0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Sergey V. Udaltsov" <svu@gnome.org>
|
||||||
|
Date: Sun, 3 Feb 2013 21:31:07 +0000
|
||||||
|
Subject: [PATCH] fr --> fra (ISO 639)
|
||||||
|
|
||||||
|
---
|
||||||
|
rules/base.extras.xml.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
|
||||||
|
index cec043f..4647bec 100644
|
||||||
|
--- a/rules/base.extras.xml.in
|
||||||
|
+++ b/rules/base.extras.xml.in
|
||||||
|
@@ -60,7 +60,7 @@
|
||||||
|
<name>ca</name>
|
||||||
|
<_shortDescription>fr</_shortDescription>
|
||||||
|
<_description>French (Canada)</_description>
|
||||||
|
- <languageList><iso639Id>fr</iso639Id></languageList>
|
||||||
|
+ <languageList><iso639Id>fra</iso639Id></languageList>
|
||||||
|
</configItem>
|
||||||
|
<variantList>
|
||||||
|
<variant>
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
31
0001-rules-fix-iso639-code-for-irish.patch
Normal file
31
0001-rules-fix-iso639-code-for-irish.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 3b2fc092cc49bc51d1108e90ad98778d3d666faf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
Date: Tue, 16 Apr 2013 17:11:47 +1000
|
||||||
|
Subject: [PATCH] rules: fix iso639 code for irish
|
||||||
|
|
||||||
|
"gla" is scottish gaelic, "gle" is irish.
|
||||||
|
|
||||||
|
http://www-01.sil.org/iso639-3/documentation.asp?id=gla
|
||||||
|
http://www-01.sil.org/iso639-3/documentation.asp?id=gle
|
||||||
|
|
||||||
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||||
|
---
|
||||||
|
rules/base.xml.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
||||||
|
index 4b9691c..6b57a72 100644
|
||||||
|
--- a/rules/base.xml.in
|
||||||
|
+++ b/rules/base.xml.in
|
||||||
|
@@ -5115,7 +5115,7 @@
|
||||||
|
<name>CloGaelach</name>
|
||||||
|
<_description>CloGaelach</_description>
|
||||||
|
<languageList>
|
||||||
|
- <iso639Id>gla</iso639Id>
|
||||||
|
+ <iso639Id>gle</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
@ -7,7 +7,7 @@
|
|||||||
Summary: X Keyboard Extension configuration data
|
Summary: X Keyboard Extension configuration data
|
||||||
Name: xkeyboard-config
|
Name: xkeyboard-config
|
||||||
Version: 2.8
|
Version: 2.8
|
||||||
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||||
@ -19,6 +19,12 @@ Source2: commitid
|
|||||||
Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
|
Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Patch01: 0001-English-Mali-layouts-have-English-language-assigned-.patch
|
||||||
|
Patch02: 0001-Fixing-ISO-codes.patch
|
||||||
|
Patch03: 0001-Fixing-wrong-iso639-3-codes.patch
|
||||||
|
Patch04: 0001-fr-fra-ISO-639.patch
|
||||||
|
Patch05: 0001-rules-fix-iso639-code-for-irish.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
@ -109,6 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
|||||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 16 2013 Peter Hutterer <peter.hutterer@redhat.com> 2.8-2
|
||||||
|
- Fix a bunch of language codes (#952510, #952519)
|
||||||
|
|
||||||
* Thu Jan 31 2013 Peter Hutterer <peter.hutterer@redhat.com> 2.8-1
|
* Thu Jan 31 2013 Peter Hutterer <peter.hutterer@redhat.com> 2.8-1
|
||||||
- xkeyboard-config 2.8
|
- xkeyboard-config 2.8
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user