rpms/xkeyboard-config/OLPC-2 xkeyboard-config-olpc-ca-fr-typofix.patch, 1.1, 1.2 xkeyboard-config.spec, 1.24, 1.25

[Sayamindu Dasgupta (sayamind)]

Author: sayamind

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

Modified Files:
	xkeyboard-config-olpc-ca-fr-typofix.patch 
	xkeyboard-config.spec 
Log Message:
Fix xkeyboard-config-olpc-ca-fr-typofix.patch so that it applies correctly

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

Index: xkeyboard-config-olpc-ca-fr-typofix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config-olpc-ca-fr-typofix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-olpc-ca-fr-typofix.patch	15 May 2008 18:50:17 -0000	1.1
+++ xkeyboard-config-olpc-ca-fr-typofix.patch	15 May 2008 19:08:31 -0000	1.2
@@ -1,10 +1,10 @@
-Index: ca
+Index: symbols/ca
 ===================================================================
 RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/ca,v
 retrieving revision 1.18
 diff -u -p -r1.18 ca
---- ca	29 Apr 2008 20:38:44 -0000	1.18
-+++ ca	14 May 2008 17:40:34 -0000
+--- symbols/ca	29 Apr 2008 20:38:44 -0000	1.18
++++ symbols/ca	14 May 2008 17:40:34 -0000
 @@ -476,7 +476,7 @@ xkb_symbols "shs" {
  // OLPC Section
  xkb_symbols "olpc" {


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xkeyboard-config.spec	15 May 2008 18:50:17 -0000	1.24
+++ xkeyboard-config.spec	15 May 2008 19:08:31 -0000	1.25
@@ -5,7 +5,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 16.%{cvsdate}%{?dist}
+Release: 17.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -72,6 +72,7 @@
 %patch12 -p0 -b .kh
 %patch13 -p0 -b .ca
 %patch14 -p0 -b .it
+%patch15 -p0 -b .ca
 
 %build
 %configure \
@@ -111,6 +112,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri May 16 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-17.20071120cvs
+- Fix xkeyboard-config-olpc-ca-fr-typofix.patch so that it applies correctly
+
 * Fri May 16 2008 Sayamindu Dasgupta <sayamindu at gmail.com> 1.1-16.20071130cvs
 - Fix typo in ca (xkeyboard-config-olpc-ca-fr-typofix.patch). Thanks to Arjun 
   Sarwal for spotting the typo. Fixes OLPC ticket #6973