rpms/xkeyboard-config/OLPC-2 olpc-xkeyboard-config-af.patch, NONE, 1.1 olpc-xkeyboard-config-kz-group.patch, NONE, 1.1 olpc-xkeyboard-config-ng-group.patch, NONE, 1.1 olpc-xkeyboard-config-ng-h.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xkeyboard-config.spec, 1.9, 1.10 xkeyboard-config-0.8-composify-ralt.patch, 1.1, NONE xkeyboard-config-0.8-dell.patch, 1.1, NONE xkeyboard-config-0.8-kinesis.patch, 1.1, NONE xkeyboard-config-0.8-korean.patch, 1.1, NONE xkeyboard-config-0.8-macbook.patch, 1.2, NONE xkeyboard-config-0.8-thinkpad.patch, 1.1, NONE

Bernardo Innocenti (bernie) fedora-extras-commits at redhat.com
Tue Nov 20 07:12:01 UTC 2007


Author: bernie

Update of /cvs/pkgs/rpms/xkeyboard-config/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17914

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Added Files:
	olpc-xkeyboard-config-af.patch 
	olpc-xkeyboard-config-kz-group.patch 
	olpc-xkeyboard-config-ng-group.patch 
	olpc-xkeyboard-config-ng-h.patch 
Removed Files:
	xkeyboard-config-0.8-composify-ralt.patch 
	xkeyboard-config-0.8-dell.patch 
	xkeyboard-config-0.8-kinesis.patch 
	xkeyboard-config-0.8-korean.patch 
	xkeyboard-config-0.8-macbook.patch 
	xkeyboard-config-0.8-thinkpad.patch 
Log Message:
* Mon Nov 19 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071119cvs
- Upgrade xkeyboard-config snapshot to cvs20071119
- Add olpc-xkeyboard-config-af.patch
- Add olpc-xkeyboard-config-kz-group.patch
- Add olpc-xkeyboard-config-ng-group.patch
- Add olpc-xkeyboard-config-ng-h.patch
- Remove olpc-xkeyboard-config-ara-fixes.patch (integrated upstream)
- Remove olpc-xkeyboard-config-br-accents.patch (integrated upstream)
- Remove olpc-xkeyboard-config-es-accents.patch (integrated upstream)
- Remove olpc-xkeyboard-config-us-typo.patch (integrated upstream)


olpc-xkeyboard-config-af.patch:

--- NEW FILE olpc-xkeyboard-config-af.patch ---
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>

olpc-xkeyboard-config-kz-group.patch:

--- NEW FILE olpc-xkeyboard-config-kz-group.patch ---
Index: symbols/kz
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/kz,v
retrieving revision 1.3
diff -u -p -r1.3 kz
--- symbols/kz	7 Oct 2007 10:05:46 -0000	1.3
+++ symbols/kz	20 Nov 2007 04:25:37 -0000
@@ -213,4 +213,5 @@ xkb_symbols "olpc" {
 
    key <TLDE> { [ parenleft,               parenright ] };
    key <BKSL> { [ Cyrillic_io,             Cyrillic_IO ] };
+   key <I219> { [ ISO_Next_Group,          ISO_Prev_Group ] };
 };

olpc-xkeyboard-config-ng-group.patch:

--- NEW FILE olpc-xkeyboard-config-ng-group.patch ---
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)"
 };

olpc-xkeyboard-config-ng-h.patch:

--- NEW FILE olpc-xkeyboard-config-ng-h.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jul 2006 22:43:06 -0000	1.2
+++ .cvsignore	20 Nov 2007 07:11:26 -0000	1.3
@@ -1 +1 @@
-xkeyboard-config-0.8.tar.bz2
+xkeyboard-config-1.1-20071120cvs.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jul 2006 22:43:06 -0000	1.2
+++ sources	20 Nov 2007 07:11:26 -0000	1.3
@@ -1 +1 @@
-48e694ebe816065670dda2a36f0581a2  xkeyboard-config-0.8.tar.bz2
+cdcefc9bb3ab6031f78f528516d3c5bd  xkeyboard-config-1.1-20071120cvs.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xkeyboard-config.spec	1 Sep 2006 10:52:10 -0000	1.9
+++ xkeyboard-config.spec	20 Nov 2007 07:11:26 -0000	1.10
@@ -1,28 +1,22 @@
 # INFO: Package contains data-only, no binaries, so no debuginfo is needed
 %define debug_package %{nil}
+%define cvsdate 20071120cvs
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 0.8
-Release: 7%{?dist}
+Version: 1.1
+Release: 5.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch0: xkeyboard-config-0.8-composify-ralt.patch
-
-# https://bugs.freedesktop.org/show_bug.cgi?id=7990
-Patch1: xkeyboard-config-0.8-thinkpad.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=7991
-Patch2: xkeyboard-config-0.8-kinesis.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=7992
-Patch3: xkeyboard-config-0.8-dell.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=8068
-Patch4: xkeyboard-config-0.8-macbook.patch
-# backport from upstream cvs
-Patch5: xkeyboard-config-0.8-korean.patch
+#Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}-%{cvsdate}.tar.bz2
+Patch0: olpc-xkeyboard-config-af.patch
+Patch1: olpc-xkeyboard-config-kz-group.patch
+Patch2: olpc-xkeyboard-config-ng-group.patch
+Patch3: olpc-xkeyboard-config-ng-h.patch
 
 BuildArch: noarch
 
@@ -30,7 +24,6 @@
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xkbcomp
 BuildRequires: perl(XML::Parser)
-#autoreconf needed for macbook patch
 BuildRequires: automake intltool
 
 # NOTE: Any packages that need xkbdata to be installed should be using
@@ -52,18 +45,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .composify-ralt
-
-%patch1 -p1 -b .thinkpad
-%patch2 -p1 -b .kinesis
-%patch3 -p1 -b .dell
-%patch4 -p1 -b .macbook
-%patch5 -p1 -b .korean
+%patch0 -p0 -b .af
+%patch1 -p0 -b .kzgroup
+%patch2 -p0 -b .nggroup
+%patch3 -p0 -b .ngh
 
 %build
-#autoreconf needed for macbook patch
-autoreconf
-
 %configure \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
@@ -79,6 +66,9 @@
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 
+# Bernie: remove locale stuff
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+
 # Create filelist
 {
    FILESLIST=${PWD}/files.list
@@ -98,6 +88,74 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Nov 19 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071119cvs
+- Upgrade xkeyboard-config snapshot to cvs20071119
+- Add olpc-xkeyboard-config-af.patch
+- Add olpc-xkeyboard-config-kz-group.patch
+- Add olpc-xkeyboard-config-ng-group.patch
+- Add olpc-xkeyboard-config-ng-h.patch
+- Remove olpc-xkeyboard-config-ara-fixes.patch (integrated upstream)
+- Remove olpc-xkeyboard-config-br-accents.patch (integrated upstream)
+- Remove olpc-xkeyboard-config-es-accents.patch (integrated upstream)
+- Remove olpc-xkeyboard-config-us-typo.patch (integrated upstream)
+
+* Sat Oct 27 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071009cvs
+- Add olpc-xkeyboard-config-ara-fixes.patch
+- Add olpc-xkeyboard-config-br-accents.patch
+- Add olpc-xkeyboard-config-es-accents.patch
+- Add olpc-xkeyboard-config-us-typo.patch
+
+* Sat Oct 09 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1-4.20071009cvs
+- Upgrade xkeyboard-config snapshot to cvs20071009
+
+* Sat Oct 06 2007 Bernardo Innocenti <bernie at codewiz.org> - 1.1-4.20071006cvs
+- Resync with Fedora Development
+- Upgrade xkeyboard-config snapshot to cvs20071006
+
+* Sat Oct  6 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-3
+- Somehow the Dell M65 model lost its vendor
+
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-2
+- Pick up the respun 1.1 release
+
+* Wed Sep 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.1-1
+- Update to 1.1
+- Drop upstreamed patches
+
+* Wed Sep  5 2007 Matthias Clasen <mclasen at redhat.com> - 1.0-1
+- Update to 1.0
+- Drop upstreamed patches
+- Update remaining patches
+
+* Tue Sep 04 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.8.20070829cvs
+- Update OLPC patch to take11 (use old evdev key name for the "view source"
+  key)
+
+* Tue Sep 04 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.8.20070829cvs
+- Downgrade xkeyboard-config snapshot to cvs20070829 to revert
+  recent evdev changes (the version of xkbcomp we ship chokes on them).
+
+* Fri Aug 31 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.7.20070831cvs
+- Update OLPC patch to take10 (integrate changes requested by
+  upstream reviewer)
+
+* Wed Aug 22 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.6.20070820cvs
+- Update OLPC patch to take9 (fix 'h' key on us layout)
+
+* Wed Aug 22 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.5.20070820cvs
+- Update OLPC patch to take8 (don't use olpc variant for et layout)
+
+* Wed Aug 22 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.4.20070820cvs
+- Update OLPC patch to take7
+
+* Mon Aug 20 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.3.20070820cvs
+- Update to CVS snapshot 20070820
+
+* Fri Jun 29 2007 Bernardo Innocenti <bernie at codewiz.org> - 0.2.20070629cvs
+- Update to CVS snapshot 20070629
+- Add OLPC patch
+- Drop patches already integrated upstream
+
 * Fri Sep  1 2006 Alexander Larsson <alexl at redhat.com> - 0.8-7
 - Update macbook patch to be closer to what got in upstream
 - (kp enter is ralt, not the option key)


--- xkeyboard-config-0.8-composify-ralt.patch DELETED ---


--- xkeyboard-config-0.8-dell.patch DELETED ---


--- xkeyboard-config-0.8-kinesis.patch DELETED ---


--- xkeyboard-config-0.8-korean.patch DELETED ---


--- xkeyboard-config-0.8-macbook.patch DELETED ---


--- xkeyboard-config-0.8-thinkpad.patch DELETED ---




More information about the fedora-extras-commits mailing list