rpms/xkeyboard-config/OLPC-2 xkeyboard-config.spec,1.11,1.12

[Bernardo Innocenti (bernie)]

Author: bernie

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

Modified Files:
	xkeyboard-config.spec 
Log Message:
* Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071130cvs
- Add olpc-xkeyboard-config-us-accents.patch
- Upgrade xkeyboard-config snapshot to cvs20071130
- Drop upstreamed patch olpc-xkeyboard-config-af.patch
- Drop upstreamed patch olpc-xkeyboard-config-kz-group.patch
- Drop upstreamed patch olpc-xkeyboard-config-ng-group.patch
- Drop upstreamed patch olpc-xkeyboard-config-ng-h.patch



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/OLPC-2/xkeyboard-config.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xkeyboard-config.spec	20 Nov 2007 08:03:16 -0000	1.11
+++ xkeyboard-config.spec	30 Nov 2007 20:39:38 -0000	1.12
@@ -1,11 +1,11 @@
 # INFO: Package contains data-only, no binaries, so no debuginfo is needed
 %define debug_package %{nil}
-%define cvsdate 20071120cvs
+%define cvsdate 20071130cvs
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.1
-Release: 5.%{cvsdate}%{?dist}
+Release: 6.%{cvsdate}%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,10 +13,7 @@
 
 #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
+Patch0: olpc-xkeyboard-config-us-accents.patch
 
 BuildArch: noarch
 
@@ -45,10 +42,7 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .af
-%patch1 -p0 -b .kzgroup
-%patch2 -p0 -b .nggroup
-%patch3 -p0 -b .ngh
+%patch0 -p0 -b .usacc
 
 %build
 %configure \
@@ -88,6 +82,14 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri Nov 30 2007 Bernardo Innocenti <bernie at codewiz.org> 1.1-5.20071130cvs
+- Add olpc-xkeyboard-config-us-accents.patch
+- Upgrade xkeyboard-config snapshot to cvs20071130
+- Drop upstreamed patch olpc-xkeyboard-config-af.patch
+- Drop upstreamed patch olpc-xkeyboard-config-kz-group.patch
+- Drop upstreamed patch olpc-xkeyboard-config-ng-group.patch
+- Drop upstreamed patch olpc-xkeyboard-config-ng-h.patch
+
 * 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