rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr.patch, NONE, 1.1 xkeyboard-config.spec, 1.20, 1.21

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-olpc-ca-fr.patch 
Log Message:
* Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
- Replace bogus xkeyboard-config-olpc-fr.patch with
  xkeyboard-config-olpc-ca-fr.patch


xkeyboard-config-olpc-ca-fr.patch:

--- NEW FILE xkeyboard-config-olpc-ca-fr.patch ---
Index: rules/base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 base.lists.part
--- rules/base.lists.part	3 Mar 2008 20:48:21 -0000	1.61
+++ rules/base.lists.part	4 Mar 2008 19:32:38 -0000
@@ -15,7 +15,7 @@
 ! $pcgeometries = abnt2 latitude jp106 kr106
 
 // Layouts that provide further specializations for the OLPC
-! $olpclayouts = af am ara br es et fr it kh kz in mn np ru th tr us 
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
 
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79
Index: symbols/ca
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/ca,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 ca
--- symbols/ca	30 Jan 2008 21:28:12 -0000	1.16
+++ symbols/ca	4 Mar 2008 19:32:38 -0000
@@ -478,3 +478,11 @@ xkb_symbols "shs" {
 
     include "level3(ralt_switch)"
 };
+
+// OLPC Section
+xkb_symbols "olpc" {
+
+    include "fr"
+
+    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
+};
Index: symbols/fr
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/fr,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 fr
--- symbols/fr	3 Mar 2008 20:36:02 -0000	1.18
+++ symbols/fr	4 Mar 2008 19:32:38 -0000
@@ -755,10 +755,3 @@ xkb_symbols "geo" {
 
 };
 
-// OLPC Section
-xkb_symbols "olpc" {
-
-    include "basic"
-
-    key <AE03>	{ [          3,    slash,          ograve,        Ograve ] };
-};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xkeyboard-config.spec	3 Mar 2008 13:29:56 -0000	1.20
+++ xkeyboard-config.spec	4 Mar 2008 19:36:29 -0000	1.21
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 12.%{cvsdate}%{?dist}
+Release: 13.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -26,7 +26,7 @@
 Patch10: xkeyboard-config-olpc-misc.patch
 Patch11: xkeyboard-config-olpc-af-AE09.patch
 Patch12: xkeyboard-config-olpc-kh-olpc-section-add.patch
-Patch13: xkeyboard-config-olpc-fr.patch
+Patch13: xkeyboard-config-olpc-ca-fr.patch
 Patch14: xkeyboard-config-olpc-it.patch
 
 BuildArch: noarch
@@ -69,7 +69,7 @@
 %patch10 -p0 -b .misc
 %patch11 -p0 -b .ae09
 %patch12 -p0 -b .kh
-%patch13 -p0 -b .fr
+%patch13 -p0 -b .ca
 %patch14 -p0 -b .it
 
 %build
@@ -110,6 +110,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Tue Mar 04 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
+- Replace bogus xkeyboard-config-olpc-fr.patch with
+  xkeyboard-config-olpc-ca-fr.patch
+
 * Mon Mar 03 2008 Bernardo Innocenti <bernie at codewiz.org> 1.1-11.20071130cvs
 - Add xkeyboard-config-olpc-fr.patch
 - Add xkeyboard-config-olpc-it.patch