rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Switch to using git patches, modelled after xorg-x11-server.

Browse Source 
- CVS remove unused patches.
This commit is contained in:
Peter Hutterer 2008-11-24 03:56:27 +00:00
parent 25935e5915
commit a926a4cbd3
10 changed files with 231 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
olpc-xkeyboard-config-af.patch
View File

@ -1,228 +0,0 @@
Index: symbols/af
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/af,v
retrieving revision 1.2
diff -u -p -r1.2 af
--- symbols/af 11 Oct 2006 19:32:35 -0000 1.2
+++ symbols/af 20 Nov 2007 04:49:21 -0000
@@ -211,3 +211,188 @@ xkb_symbols "uz" {
include "level3(ralt_switch)"
};
+partial alphanumeric_keys
+xkb_symbols "olpc-ps" {
+
+ name[Group1]= "Afghanistan - Pashto";
+
+ key <TLDE> { [ 0x100200D, 0x1000654, grave ] }; // zero width joiner, Arabic hamza above
+ key <AE01> { [ 0x10006F1, exclam, tilde ] }; // Arabic one
+ key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+ key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+ key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+ key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+ key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
+ key <AE07> { [ 0x10006F7, guillemontright, ampersand ] }; // Arabic seven
+ key <AE08> { [ 0x10006F8, guillemontleft, 0x100066D ] }; // Arabic eight, Arabic five-pointed star
+ key <AE09> { [ 0x10006F9, parenright, bullet ] }; // Arabic nine
+ key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
+ key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+ key <AE12> { [ plus, equal, divide ] };
+
+ key <AD01> { [ 0x1000636, 0x1000652, eurosign ] }; // Arabic dad, Arabic sukun
+ key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
+ key <AD03> { [ 0x100062B, 0x100064D, 0x1000649 ] }; // Arabic theh, Arabic kasratan, Arabic alef maksura initial form
+ key <AD04> { [ 0x1000642, 0x100064B, 0x100200E ] }; // Arabic qaf, Arabic fathatan, left-to-right mark
+ key <AD05> { [ 0x1000641, 0x100064F, 0x100200F ] }; // Arabic feh, Arabic damma, right-to-left mark
+ key <AD06> { [ 0x100063A, 0x1000650, 0x100e653 ] }; // Arabic ghain, Arabic kasra, Arabic alef with madda above
+ key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+ key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+ key <AD09> { [ 0x100062E, 0x1000681, apostrophe ] }; // Arabic khah, Arabic hah with hamza above,
+ key <AD10> { [ 0x100062D, 0x1000685, quotedbl ] }; // Arabic hah, Arabic hah with three dots above
+ key <AD11> { [ 0x100062C, bracketright, braceleft ] }; // Arabic jeem
+ key <AD12> { [ 0x1000686, bracketleft, braceright ] }; // Arabic tcheh
+
+ key <AC01> { [ 0x1000634, 0x100069A ] }; // Arabic sheen, Arabic seen with dot below and dot above
+ key <AC02> { [ 0x1000633, 0x10006CD ] }; // Arabic seen, Arabic yeh with tail
+ key <AC03> { [ 0x10006CC, 0x100064A, 0x10006D2 ] }; // Farsi yeh, Arabic yeh, Arabic yeh barree
+ key <AC04> { [ 0x1000628, 0x100067E, 0x10006BA ] }; // Arabic beh, Arabic peh, Arabic noon ghunna
+ key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+ key <AC06> { [ 0x1000627, 0x1000622, 0x1000625 ] }; // Arabic alef, Arabic madda on alef, Arabic alef with hamza below
+ key <AC07> { [ 0x100062A, 0x100067C, 0x1000679 ] }; // Arabic teh, Arabic teh with ring, Arabic tteh
+ key <AC08> { [ 0x1000646, 0x10006BC, greater ] }; // Arabic noon, Arabic noon with ring
+ key <AC09> { [ 0x1000645, 0x1000629, less ] }; // Arabic meem, Arabic teh marbuta
+ key <AC10> { [ 0x10006A9, colon, 0x1000643 ] }; // Arabic keheh, Arabic kaf
+ key <AC11> { [ 0x10006AB, 0x100061B, 0x10006AF ] }; // Arabic kaf with ring, Arabic semicolon, Arabic gaf
+
+ key <BKSL> { [ backslash, asterisk, bar ] };
+ key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+ key <AB01> { [ 0x1000638, 0x1000626, question] }; // Arabic zah, Arabic yeh with hamza above
+ key <AB02> { [ 0x10006D0, 0x1000637, semicolon ] }; // Arabic tah, Arabic E
+ key <AB03> { [ 0x1000632, 0x1000698 ] }; // Arabic zain, Arabic jeh
+ key <AB04> { [ 0x1000631, 0x1000621 ] }; // Arabic_ra (reh?), Arabic hamza
+ key <AB05> { [ 0x1000630, 0x100200C ] }; // Arabic_thal, zero width non-joiner
+ key <AB06> { [ 0x100062F, 0x1000689, 0x1000688 ] }; // Arabic_dal, Arabic dal with ring, Arabic ddal
+ key <AB07> { [ 0x1000693, 0x1000624, 0x1000691 ] }; // Arabic reh with ring, Arabic waw with hamza above, Arabic rreh
+ key <AB08> { [ 0x1000648, period, comma ] }; // Arabic_waw, Arabic comma
+ key <AB09> { [ 0x1000696, 0x100002E, 0x10006C7 ] }; // Arabic reh with dot below and dot above, full stop, Arabic letter U
+ key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+ //language key
+ key <I219> { [ISO_Next_Group , ISO_Prev_Group ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc-da" {
+
+ name[Group1]= "Afghanistan - Dari";
+
+ key <TLDE> { [ 0x100200D, divide, tilde ] }; // zero width joiner
+ key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+ key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+ key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+ key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+ key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+ key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
+ key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+ key <AE08> { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight,
+ key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+ key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+ key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+ key <AE12> { [ plus, equal ] };
+
+ key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+ key <AD02> { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan
+ key <AD03> { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan
+ key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+ key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+ key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+ key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+ key <AD08> { [ 0x1000647, 0x1000651, 0x1000655 ] }; // Arabic heh, Arabic shadda, Arabic hamza below
+ key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+ key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+ key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+ key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+ key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+ key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+ key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+ key <AC04> { [ 0x1000628, 0x1000625, 0x10006D0 ] }; // Arabic beh, Arabic alef with hamza below, Arabic e
+ key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+ key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+ key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+ key <AC08> { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+ key <AC09> { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+ key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh,
+ key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+ key <BKSL> { [ backslash, bar, question ] };
+ key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+ key <AB01> { [ 0x1000638, 0x1000643, 0x10006D2 ] }; // Arabic zah, Arabic kaf, Arabic yeh barree
+ key <AB02> { [ 0x1000637, 0x1000653, 0x1000691 ] }; // Arabic tah, Arabic maddah above, Arabic rreh
+ key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh, Arabic reh with dot below and dot above
+ key <AB04> { [ 0x1000631, 0x1000670, 0x1000693 ] }; // Arabic_ra (reh?), Arabic superscript alef, Arabic reh with ring
+ key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+ key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+ key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+ key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+ key <AB09> { [ period, less, 0x10006C7 ] }; // Arabic u
+ key <AB10> { [ slash, 0x100061F, 0x10006C9 ] }; // Arabic question mark, Arabic kirghiz yu
+
+ //language key
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc-uz" {
+
+ name[Group1]= "Afghanistan - Uzbek";
+
+ key <TLDE> { [ 0x100200D, divide, tilde ] }; // zero width joiner
+ key <AE01> { [ 0x10006F1, exclam, grave ] }; // Arabic one
+ key <AE02> { [ 0x10006F2, 0x100066C. at ] }; // Arabic two, Arabic thousands separator
+ key <AE03> { [ 0x10006F3, 0x100066B, numbersign ] }; // Arabic three, Arabic decimal separator
+ key <AE04> { [ 0x10006F4, 0x100060B, dollar ] }; // Arabic four, Afghani sign
+ key <AE05> { [ 0x10006F5, 0x100066A, percent ] }; // Arabic five, Arabic percent sign
+ key <AE06> { [ 0x10006F6, multiply, circumflex ] }; // Arabic six
+ key <AE07> { [ 0x10006F7, 0x100060C, ampersand ] }; // Arabic seven, Arabic comma
+ key <AE08> { [ 0x10006F8, asterisk, bullet ] }; // Arabic eight,
+ key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
+ key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
+ key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
+ key <AE12> { [ plus, equal ] };
+
+ key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
+ key <AD02> { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above
+ key <AD03> { [ 0x100062B, 0x100064D, eurosign ] }; // Arabic theh, Arabic kasratan
+ key <AD04> { [ 0x1000642, 0x100064B, 0x100FD3E ] }; // Arabic qaf, Arabic fathatan, ornate left paren
+ key <AD05> { [ 0x1000641, 0x100064F, 0x100FD3F ] }; // Arabic feh, Arabic damma, ornate right paren
+ key <AD06> { [ 0x100063A, 0x1000650, 0x1000656 ] }; // Arabic ghain, Arabic kasra, Arabic subscript alef
+ key <AD07> { [ 0x1000639, 0x100064E, 0x100e659 ] }; // Arabic ain, Arabic fatha, Arabic zwarakay
+ key <AD08> { [ 0x1000647, 0x1000651, 0x1000670 ] }; // Arabic heh, Arabic shadda, Arabic superscript alef
+ key <AD09> { [ 0x100062E, bracketright, apostrophe ] }; // Arabic khah
+ key <AD10> { [ 0x100062D, bracketleft, quotedbl ] }; // Arabic hah
+ key <AD11> { [ 0x100062C, braceright, 0x1000681 ] }; // Arabic jeem, Arabic hah with hamza above
+ key <AD12> { [ 0x1000686, braceleft, 0x1000685 ] }; // Arabic tcheh, Arabic hah with three dots above
+
+ key <AC01> { [ 0x1000634, 0x1000624, 0x100069A ] }; // Arabic sheen, Arabic waw with hamza above, Arabic seen with dot below and dot above
+ key <AC02> { [ 0x1000633, 0x1000626, 0x10006CD ] }; // Arabic seen, Arabic yeh with hamza above, Arabic yeh with tail
+ key <AC03> { [ 0x10006CC, 0x100064A, 0x1000649 ] }; // Farsi yeh, Arabic yeh, Arabic alef maksura
+ key <AC04> { [ 0x1000628, 0x10006D0, 0x1000643 ] }; // Arabic beh, Arabic e, Arabic kaf
+ key <AC05> { [ 0x1000644, 0x1000623, 0x10006B7 ] }; // Arabic lam, Arabic hamza on alef, Arabic alef with hamza above
+ key <AC06> { [ 0x1000627, 0x1000622, 0x1000671 ] }; // Arabic alef, Arabic madda on alef, Arabic alef wasla
+ key <AC07> { [ 0x100062A, 0x1000629, 0x100067C ] }; // Arabic teh, Arabic teh marbuta, Arabic tteh
+ key <AC08> { [ 0x1000646, guillemontright, 0x10006BC ] }; // Arabic noon, Arabic noon with ring
+ key <AC09> { [ 0x1000645, guillemontleft, 0x10006BA ] }; // Arabic meem, Arabic noon ghunna
+ key <AC10> { [ 0x10006A9, colon, semicolon ] }; // Arabic keheh,
+ key <AC11> { [ 0x10006AF, 0x100061B, 0x10006AB ] }; // Arabic gaf, Arabic semicolon, Arabic kaf with ring
+
+ key <BKSL> { [ backslash, bar, question ] };
+ key <SPCE> { [ space, 0x100200C, 0x10000A0 ] }; // zero width non-joiner, no break space
+
+ key <AB01> { [ 0x1000638, 0x10006C9, 0x10006D2 ] }; // Arabic zah, Arabic kirghiz yu, Arabic yeh barree
+ key <AB02> { [ 0x1000637, 0x10006C7, 0x1000691 ] }; // Arabic tah, Arabic u, Arabic rreh
+ key <AB03> { [ 0x1000632, 0x1000698, 0x1000696 ] }; // Arabic zain, Arabic jeh, Arabic reh with dot below and dot above
+ key <AB04> { [ 0x1000631, 0x1000625, 0x1000693 ] }; // Arabic_ra (reh?), Arabic alef with hamza below, Arabic reh with ring
+ key <AB05> { [ 0x1000630, 0x100200C, 0x1000688 ] }; // Arabic_thal, zero width non-joiner, Arabic ddal
+ key <AB06> { [ 0x100062F, 0x1000654, 0x1000689 ] }; // Arabic dal, Arabic hamza above, Arabic dal with ring
+ key <AB07> { [ 0x100067E, 0x1000621, 0x1000679 ] }; // Arabic peh, Arabic hamza, Arabic tteh
+ key <AB08> { [ 0x1000648, greater, comma ] }; // Arabic_waw
+ key <AB09> { [ period, less ] };
+ key <AB10> { [ slash, 0x100061F, 0x1000655 ] }; // Arabic question mark, Arabic hamza below
+
+ //language key
+ key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
Index: rules/base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.224
diff -u -p -r1.224 base.xml.in
--- rules/base.xml.in 18 Nov 2007 11:42:54 -0000 1.224
+++ rules/base.xml.in 20 Nov 2007 04:49:22 -0000
@@ -1082,6 +1082,24 @@
<_description>Southern Uzbek</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>olpc-ps</name>
+ <_description>OLPC Pashto</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>olpc-da</name>
+ <_description>OLPC Dari</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>olpc-uz</name>
+ <_description>OLPC Southern Uzbek</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>

7
olpc-xkeyboard-config-kz-group.patch
View File

@ -1,3 +1,10 @@
From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Mon, 24 Nov 2008 13:01:22 +1000
Subject: [PATCH] OLPC: map group switching to I219 in symbols(kz)
---
diff -up xkeyboard-config-1.2/symbols/kz.kzgroup xkeyboard-config-1.2/symbols/kz diff -up xkeyboard-config-1.2/symbols/kz.kzgroup xkeyboard-config-1.2/symbols/kz
--- xkeyboard-config-1.2/symbols/kz.kzgroup 2008-01-24 18:21:06.000000000 -0500 --- xkeyboard-config-1.2/symbols/kz.kzgroup 2008-01-24 18:21:06.000000000 -0500
+++ xkeyboard-config-1.2/symbols/kz 2008-02-07 12:23:56.000000000 -0500 +++ xkeyboard-config-1.2/symbols/kz 2008-02-07 12:23:56.000000000 -0500

12
olpc-xkeyboard-config-ng-group.patch
View File

@ -1,12 +0,0 @@
diff -u -p -r1.4 ng
--- symbols/ng 28 Oct 2007 08:53:29 -0000 1.4
+++ symbols/ng 20 Nov 2007 06:20:24 -0000
@@ -111,7 +111,7 @@ xkb_symbols "olpc" {
key <AB09> { [ period, greater, guillemotright, guillemotright ] };
key <AB10> { [ slash, question, questiondown, questiondown ] };
- key <I219> { [ ISO_Next_Group, ISO_Prev_Group ] };
+ key <I219> { [ multiply, division, ISO_Next_Group, ISO_Prev_Group ] };
include "level3(ralt_switch)"
};

12
olpc-xkeyboard-config-ng-h.patch
View File

@ -1,12 +0,0 @@
diff -u -p -u -p -r1.4 ng
--- symbols/ng 28 Oct 2007 08:53:29 -0000 1.4
+++ symbols/ng 19 Nov 2007 21:51:34 -0000
@@ -94,7 +94,7 @@ xkb_symbols "olpc" {
key <AC03> { [ d, D, 0x1000257, 0x100018A ] }; // D with hook
key <AC04> { [ f, F, 0x1001E0D, 0x1001E0C ] }; // D with dot below
key <AC05> { [ g, G, 0x1000272, 0x100019D ] }; // N with left hook
- key <AC06> { [ u, U, 0x1001EE5, 0x1001EE4 ] }; // U with dot below
+ key <AC06> { [ h, H, 0x1001EE5, 0x1001EE4 ] }; // U with dot below
key <AC07> { [ j, J, 0x1001ECB, 0x1001ECA ] }; // I with dot below
key <AC08> { [ k, K, 0x1000199, 0x1000198 ] }; // K with hook
key <AC09> { [ l, L, 0x10001E37, 0x1001E36 ] }; // L with dot below

31
usinet.patch
View File

@ -1,7 +1,18 @@
diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/rules/base.lists.part From f6b527515a6eb088c7ff6eb66bda454e20df371e Mon Sep 17 00:00:00 2001
--- xkeyboard-config-1.2/rules/base.lists.part.usinet 2008-01-11 17:19:47.000000000 -0500 From: Fedora X Ninjas <x@fedoraproject.org>
+++ xkeyboard-config-1.2/rules/base.lists.part 2008-04-14 22:47:19.000000000 -0400 Date: Mon, 24 Nov 2008 13:10:56 +1000
@@ -52,6 +52,7 @@ Subject: [PATCH] Add include inet(media_nav_common) by default for pc105
---
rules/base.lists.part | 1 +
symbols/inet | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/rules/base.lists.part b/rules/base.lists.part
index b08ab24..f9207b6 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -53,6 +53,7 @@
microsoftoffice microsoftmult \ microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \ mx1998 mx2500 mx2750 \
oretec \ oretec \
@ -9,10 +20,11 @@ diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/
presario propeller \ presario propeller \
qtronix \ qtronix \
rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/inet diff --git a/symbols/inet b/symbols/inet
--- xkeyboard-config-1.2/symbols/inet.usinet 2008-01-07 18:07:51.000000000 -0500 index 54ec241..568cc4a 100644
+++ xkeyboard-config-1.2/symbols/inet 2008-04-14 22:48:23.000000000 -0400 --- a/symbols/inet
@@ -2211,3 +2211,9 @@ xkb_symbols "classmate" { +++ b/symbols/inet
@@ -2234,3 +2234,9 @@ xkb_symbols "classmate" {
key <I30> { [ XF86AudioRaiseVolume ] }; key <I30> { [ XF86AudioRaiseVolume ] };
}; };
@ -22,3 +34,6 @@ diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/i
+xkb_symbols "pc105" { +xkb_symbols "pc105" {
+ include "inet(media_nav_common)" + include "inet(media_nav_common)"
+}; +};
--
1.6.0.3

13
xkeyboard-config-1.3-AC11-mapping-is.patch
View File

@ -1,13 +0,0 @@
diff --git a/symbols/is b/symbols/is
index ce03b3b..d68ae95 100644
--- a/symbols/is
+++ b/symbols/is
@@ -22,7 +22,7 @@ xkb_symbols "basic" {
key <AD12> { [apostrophe, question, asciitilde, dead_macron ] };
key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] };
- key <AC11> { [dead_acute, Adiaeresis, dead_circumflex, dead_caron] };
+ key <AC11> { [dead_acute, dead_circumflex, dead_circumflex ] };
key <TLDE> { [ degree, diaeresis, notsign, notsign ] };
key <BKSL> { [ plus, asterisk, grave, dead_breve ] };

19
xkeyboard-config-1.4-battery.patch
View File

@ -1,6 +1,16 @@
diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/inet From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001
--- xkeyboard-config-1.4/symbols/inet.orig 2008-10-24 11:49:36.000000000 +1030 From: Fedora X Ninjas <x@fedoraproject.org>
+++ xkeyboard-config-1.4/symbols/inet 2008-10-24 11:49:52.000000000 +1030 Date: Mon, 24 Nov 2008 13:01:22 +1000
Subject: [PATCH] Map KEY_BATTERY, WLAN, BLUETOOTH, UWB to their XF86<...> keycodes.
---
symbols/inet | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/symbols/inet b/symbols/inet
index 54ec241..50b559b 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -158,9 +158,10 @@ xkb_symbols "evdev" { @@ -158,9 +158,10 @@ xkb_symbols "evdev" {
key <I241> { [ XF86MailForward ] }; key <I241> { [ XF86MailForward ] };
key <I242> { [ XF86Save ] }; key <I242> { [ XF86Save ] };
@ -15,3 +25,6 @@ diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/ine
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source // key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source // key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min // key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
--
1.6.0.3

20
xkeyboard-config-1.4-jp-tilde.patch
View File

@ -1,6 +1,17 @@
diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp From 824ce3a400a452929f90a038033c83055c01a2d7 Mon Sep 17 00:00:00 2001
--- xkeyboard-config-1.4/symbols/jp.orig 2008-11-11 11:19:41.000000000 +1000 From: Fedora X Ninjas <x@fedoraproject.org>
+++ xkeyboard-config-1.4/symbols/jp 2008-11-11 11:37:53.000000000 +1000 Date: Mon, 24 Nov 2008 12:59:09 +1000
Subject: [PATCH] Map TLDE to Zenkaku/Hankaku in jp, and BKSL to bracket/brace right (#469537).
This patch is only needed for jp on a non-jp106 keyboard model.
---
symbols/jp | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/symbols/jp b/symbols/jp
index 694090c..ef0b0f7 100644
--- a/symbols/jp
+++ b/symbols/jp
@@ -24,6 +24,13 @@ xkb_symbols "common" { @@ -24,6 +24,13 @@ xkb_symbols "common" {
symbols[Group1]= [ Zenkaku_Hankaku, Kanji ] symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
}; };
@ -15,3 +26,6 @@ diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp
key <AE01> { [ 1, exclam ] }; key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, quotedbl ] }; key <AE02> { [ 2, quotedbl ] };
key <AE03> { [ 3, numbersign ] }; key <AE03> { [ 3, numbersign ] };
--
1.6.0.3

236
xkeyboard-config-1.4-tj-variant.patch
View File

@ -1,8 +1,18 @@
From 39107a296f89fc61ede5b88ba97e9d6eb311c004 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Mon, 24 Nov 2008 13:06:10 +1000
Subject: [PATCH] Add legacy and basic tj layouts (#455796)
---
rules/base.xml.in | 9 ++-
symbols/tj | 197 ++++++++++++++++++++++++++++++++++------------------
2 files changed, 137 insertions(+), 69 deletions(-)
diff --git a/rules/base.xml.in b/rules/base.xml.in diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5040879..5b12f9f 100644 index 8d0aa92..1fefc62 100644
--- a/rules/base.xml.in --- a/rules/base.xml.in
+++ b/rules/base.xml.in +++ b/rules/base.xml.in
@@ -3594,7 +3594,20 @@ i </variant> @@ -3580,7 +3580,14 @@
<_description>Tajikistan</_description> <_description>Tajikistan</_description>
<languageList><iso639Id>tgk</iso639Id></languageList> <languageList><iso639Id>tgk</iso639Id></languageList>
</configItem> </configItem>
@ -10,12 +20,6 @@ index 5040879..5b12f9f 100644
+ <variantList> + <variantList>
+ <variant> + <variant>
+ <configItem> + <configItem>
+ <name>std</name>
+ <_description>Standard</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>legacy</name> + <name>legacy</name>
+ <_description>Legacy</_description> + <_description>Legacy</_description>
+ </configItem> + </configItem>
@ -25,13 +29,23 @@ index 5040879..5b12f9f 100644
<layout> <layout>
<configItem> <configItem>
diff --git a/symbols/tj b/symbols/tj diff --git a/symbols/tj b/symbols/tj
index f07b290..d9e5ff6 100644 index f07b290..a72b18d 100644
--- a/symbols/tj --- a/symbols/tj
+++ b/symbols/tj +++ b/symbols/tj
@@ -76,3 +76,140 @@ xkb_symbols "basic" { @@ -1,78 +1,139 @@
// End alphanumeric section // $XKeyboardConfig$
}; -// based on
-// Tajik keyboard
-// it is a Russian layout keyboard, with SHCHA replaced with
-// dead_cedilla/dead_macron
-// that allows to type the SHCHA with dead_cedilla + SHA
-// and all the extra Tajik keys:
-// dead_cedilla + KA, HA --> KA descender, HA descender
-// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
-// it requires proper dead_cedilla and dead_macron entries in Compose file
-// it also allows to use Mode_switch when in cyrillic mode to enter
-// special letters by doing Mode_switch + base letter
+// 17/07/2008 +// 17/07/2008
+// ------------------------------------------------------------- +// -------------------------------------------------------------
+// Standard Tojiki Keyboard Layout, Official Standard +// Standard Tojiki Keyboard Layout, Official Standard
@ -43,16 +57,24 @@ index f07b290..d9e5ff6 100644
+// -------------------------------------------------------------------- +// --------------------------------------------------------------------
+// -------------- Tajiki Official Keyboard Layout---------------------- +// -------------- Tajiki Official Keyboard Layout----------------------
+// -------------------------------------------------------------------- +// --------------------------------------------------------------------
+// //
+ -// AEN <aen@logic.ru> (for the Russian layout)
+partial alphanumeric_keys -// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
+xkb_symbols "std" -//
-// 2008-06-22
-// Changed so that RightAlt allows to type the extra Tajik keys and that
-// SHCHA is back to normal again
+partial default alphanumeric_keys
+xkb_symbols "basic"
+{ +{
+ name[Group1] = "Tajikistan - Standard"; + name[Group1] = "Tajikistan";
+ +
+ include "keypad(comma)" + include "keypad(comma)"
+ include "level3(ralt_switch)" + include "level3(ralt_switch)"
+
-partial default alphanumeric_keys
-xkb_symbols "basic" {
+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я + key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я
+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч + key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С + key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С
@ -102,7 +124,8 @@ index f07b290..d9e5ff6 100644
+ key <LSGT> { [ slash, bar ] }; // / | + key <LSGT> { [ slash, bar ] }; // / |
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё + key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё
+}; +};
+
- name[Group1]= "Tajikistan";
+// -------------------------------------------------------------------- +// --------------------------------------------------------------------
+// -------------- Tojiki Rusi Keyboard Layout-------------------------- +// -------------- Tojiki Rusi Keyboard Layout--------------------------
+// -------------------------------------------------------------------- +// --------------------------------------------------------------------
@ -111,14 +134,62 @@ index f07b290..d9e5ff6 100644
+// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru> +// 2005/12/09 Valery Inozemtsev <shrek@altlinux.ru>
+// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes) +// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
+// -------------------------------------------------------------------- +// --------------------------------------------------------------------
+
- key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] };
- key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x010004b7, 0x010004b6 ] };
- key <AB03> { [ Cyrillic_es, Cyrillic_ES ] };
- key <AB04> { [ Cyrillic_em, Cyrillic_EM ] };
- key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x010004e3, 0x010004e2 ] };
- key <AB06> { [ Cyrillic_te, Cyrillic_TE ] };
- key <AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
- key <AB08> { [ Cyrillic_be, Cyrillic_BE ] };
- key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] };
- key <AB10> { [ slash, question ] };
- key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] };
- key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] };
- key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] };
- key <AC04> { [ Cyrillic_a, Cyrillic_A ] };
- key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] };
- key <AC06> { [ Cyrillic_er, Cyrillic_ER ] };
- key <AC07> { [ Cyrillic_o, Cyrillic_O ] };
- key <AC08> { [ Cyrillic_el, Cyrillic_EL ] };
- key <AC09> { [ Cyrillic_de, Cyrillic_DE ] };
- key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, 0x01000497, 0x01000496 ] };
- key <AC11> { [ Cyrillic_e, Cyrillic_E ] };
- key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
- key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] };
- key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x010004ef, 0x010004ee ] };
- key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x0100049b, 0x0100049a ] };
- key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] };
- key <AD06> { [ Cyrillic_en, Cyrillic_EN ] };
- key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x01000493, 0x01000492 ] };
- key <AD08> { [ Cyrillic_sha, Cyrillic_SHA, Cyrillic_shcha, Cyrillic_SHCHA] };
- key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
- key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] };
- key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x010004b3, 0x010004b2 ] };
- key <AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, quotedbl ] };
- key <AE03> { [ 3, apostrophe ] };
- key <AE04> { [ 4, asterisk ] };
- key <AE05> { [ 5, colon ] };
- key <AE06> { [ 6, comma ] };
- key <AE07> { [ 7, period ] };
- key <AE08> { [ 8, semicolon ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
- key <LSGT> { [ bar, brokenbar ] };
- key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
+xkb_symbols "legacy" +xkb_symbols "legacy"
+{ +{
+ name[Group1] = "Tajikistan - Legacy"; + name[Group1] = "Tajikistan - Legacy";
+
- // End alphanumeric section
+ include "keypad(comma)" + include "keypad(comma)"
+ include "level3(ralt_switch)" + include "level3(ralt_switch)"
+
+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я + key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // я Я
+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ + key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ
+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С + key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // с С
@ -167,125 +238,8 @@ index f07b290..d9e5ff6 100644
+ key <BKSL> { [ backslash, slash ] }; // \ / + key <BKSL> { [ backslash, slash ] }; // \ /
+ key <LSGT> { [ slash, bar ] }; // / | + key <LSGT> { [ slash, bar ] }; // / |
+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё + key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // ё Ё
+}; };
+ +
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 13ba046..c770633 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -3597,12 +3597,6 @@
<variantList>
<variant>
<configItem>
- <name>std</name>
- <_description>Standard</_description>
- </configItem>
- </variant>
- <variant>
- <configItem>
<name>legacy</name>
<_description>Legacy</_description>
</configItem>
diff --git a/symbols/tj b/symbols/tj
index d9e5ff6..fcb884d 100644
--- a/symbols/tj
+++ b/symbols/tj
@@ -1,81 +1,5 @@
// $XKeyboardConfig$
-// based on
-// Tajik keyboard
-// it is a Russian layout keyboard, with SHCHA replaced with
-// dead_cedilla/dead_macron
-// that allows to type the SHCHA with dead_cedilla + SHA
-// and all the extra Tajik keys:
-// dead_cedilla + KA, HA --> KA descender, HA descender
-// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
-// it requires proper dead_cedilla and dead_macron entries in Compose file
-// it also allows to use Mode_switch when in cyrillic mode to enter
-// special letters by doing Mode_switch + base letter
-//
-// AEN <aen@logic.ru> (for the Russian layout)
-// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
-//
-// 2008-06-22
-// Changed so that RightAlt allows to type the extra Tajik keys and that
-// SHCHA is back to normal again
-
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
- name[Group1]= "Tajikistan";
-
- key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] };
- key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x010004b7, 0x010004b6 ] };
- key <AB03> { [ Cyrillic_es, Cyrillic_ES ] };
- key <AB04> { [ Cyrillic_em, Cyrillic_EM ] };
- key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x010004e3, 0x010004e2 ] };
- key <AB06> { [ Cyrillic_te, Cyrillic_TE ] };
- key <AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
- key <AB08> { [ Cyrillic_be, Cyrillic_BE ] };
- key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] };
- key <AB10> { [ slash, question ] };
- key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] };
- key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] };
- key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] };
- key <AC04> { [ Cyrillic_a, Cyrillic_A ] };
- key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] };
- key <AC06> { [ Cyrillic_er, Cyrillic_ER ] };
- key <AC07> { [ Cyrillic_o, Cyrillic_O ] };
- key <AC08> { [ Cyrillic_el, Cyrillic_EL ] };
- key <AC09> { [ Cyrillic_de, Cyrillic_DE ] };
- key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, 0x01000497, 0x01000496 ] };
- key <AC11> { [ Cyrillic_e, Cyrillic_E ] };
- key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
- key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] };
- key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x010004ef, 0x010004ee ] };
- key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x0100049b, 0x0100049a ] };
- key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] };
- key <AD06> { [ Cyrillic_en, Cyrillic_EN ] };
- key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x01000493, 0x01000492 ] };
- key <AD08> { [ Cyrillic_sha, Cyrillic_SHA, Cyrillic_shcha, Cyrillic_SHCHA] };
- key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
- key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] };
- key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x010004b3, 0x010004b2 ] };
- key <AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, quotedbl ] };
- key <AE03> { [ 3, apostrophe ] };
- key <AE04> { [ 4, asterisk ] };
- key <AE05> { [ 5, colon ] };
- key <AE06> { [ 6, comma ] };
- key <AE07> { [ 7, period ] };
- key <AE08> { [ 8, semicolon ] };
- key <AE09> { [ 9, parenleft ] };
- key <AE10> { [ 0, parenright ] };
- key <AE11> { [ minus, underscore ] };
- key <AE12> { [ equal, plus ] };
- key <LSGT> { [ bar, brokenbar ] };
- key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
-
- // End alphanumeric section
-
-};
// 17/07/2008
// -------------------------------------------------------------
// Standard Tojiki Keyboard Layout, Official Standard
@@ -89,10 +13,10 @@ xkb_symbols "basic" {
// --------------------------------------------------------------------
//
-partial alphanumeric_keys
-xkb_symbols "std"
+partial default alphanumeric_keys
+xkb_symbols "basic"
{
- name[Group1] = "Tajikistan - Standard";
+ name[Group1] = "Tajikistan";
include "keypad(comma)"
include "level3(ralt_switch)"
-- --
1.5.4.3 1.6.0.3

24
xkeyboard-config.spec
View File

@ -4,7 +4,7 @@
Summary: X Keyboard Extension configuration data Summary: X Keyboard Extension configuration data
Name: xkeyboard-config Name: xkeyboard-config
Version: 1.4 Version: 1.4
Release: 6%{?dist} Release: 7%{?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
@ -28,6 +28,7 @@ BuildRequires: xkbcomp
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: intltool BuildRequires: intltool
BuildRequires: gettext BuildRequires: gettext
BuildRequires: git-core
# NOTE: Any packages that need xkbdata to be installed should be using # NOTE: Any packages that need xkbdata to be installed should be using
# the following "Requires: xkbdata" virtual provide, and not directly depending # the following "Requires: xkbdata" virtual provide, and not directly depending
@ -49,12 +50,17 @@ This package contains configuration data used by the X Keyboard Extension
interface. interface.
%prep %prep
%setup -q %setup -q -n %{name}-%{version}
%patch1 -p1 -b .kzgroup
%patch2 -p1 -b .usinet git init-db
%patch3 -p1 -b .tj-variants if [ -z "$GIT_COMMITTER_NAME" ]; then
%patch4 -p1 -b .battery git config user.email "x@fedoraproject.org"
%patch5 -p1 -b .jp-tilde git config user.name "Fedora X Ninjas"
fi
git add .
git commit -a -q -m "%{version} baseline."
git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
%build %build
%configure \ %configure \
@ -94,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml %{_datadir}/X11/xkb/rules/xorg.xml
%changelog %changelog
* Mon Nov 24 2008 Peter Hutterer <peter.hutterer@redhat.com> - 1.4-7
- Switch to using git patches, modelled after xorg-x11-server.
- CVS remove unused patches.
* Sat Nov 22 2008 Matthias Clasen <mclasen@redhat.com> - 1.4-6 * Sat Nov 22 2008 Matthias Clasen <mclasen@redhat.com> - 1.4-6
- Improve %%summary and %%description - Improve %%summary and %%description
- Better URL - Better URL