1.2

.cvsignore

@@ -1 +1 @@
-xkeyboard-config-1.1-20071120cvs.tar.bz2
+xkeyboard-config-1.2.tar.bz2

olpc-xkeyboard-config-kz-group.patch

@@ -1,13 +1,12 @@
-Index: 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
-RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/kz,v
++++ xkeyboard-config-1.2/symbols/kz	2008-02-07 12:23:56.000000000 -0500
-retrieving revision 1.3
+@@ -213,6 +213,7 @@ xkb_symbols "olpc" {
-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 ] };
++ 
+    include "group(olpc)"
  };

sources

@@ -1 +1 @@
-cdcefc9bb3ab6031f78f528516d3c5bd  xkeyboard-config-1.1-20071120cvs.tar.bz2
+667c582a54d5715d24110c20e8c4be38  xkeyboard-config-1.2.tar.bz2

xkeyboard-config.spec

@@ -1,22 +1,17 @@
 # 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: 1.1
+Version: 1.2
-Release: 5.%{cvsdate}%{?dist}
+Release: 1%{?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
+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
 
@@ -45,10 +40,7 @@ xkeyboard-config alternative xkb data files
 
 %prep
 %setup -q
-%patch0 -p0 -b .af
+%patch1 -p1 -b .kzgroup
-%patch1 -p0 -b .kzgroup
-%patch2 -p0 -b .nggroup
-%patch3 -p0 -b .ngh
 
 %build
 %configure \
@@ -88,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Thu Feb  7 2008 Matthias Clasen  <mclasen@redhat.com> - 1.2-1
+- Update to 1.2
+- Remove upstreamed olpc patches
+
 * Mon Nov 19 2007 Bernardo Innocenti <bernie@codewiz.org> 1.1-5.20071119cvs
 - Upgrade xkeyboard-config snapshot to cvs20071119
 - Add olpc-xkeyboard-config-af.patch