OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=20

cz_sk-dropKPDL.diff

@@ -1,36 +0,0 @@
-Index: symbols/sk
-===================================================================
-RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/sk,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -r1.8 -r1.9
---- symbols/sk	16 Jan 2005 02:18:20 -0000	1.8
-+++ symbols/sk	16 Feb 2008 00:53:45 -0000	1.9
-@@ -71,9 +71,6 @@
- 
-     key <SPCE>  { [     space,      space, nobreakspace, nobreakspace ] };
- 
--    key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
--                  [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
--
-     include "level3(ralt_switch)"
- };
- 
-Index: symbols/cz
-===================================================================
-RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/cz,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- symbols/cz	18 Jan 2005 18:17:48 -0000	1.9
-+++ symbols/cz	16 Feb 2008 00:53:45 -0000	1.10
-@@ -70,9 +70,6 @@
- 
-     key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ]	};
- 
--    key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
--                  [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
--
-     include "level3(ralt_switch)"
- };
- 

xkeyboard-config.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  7 18:26:41 CEST 2008 - sndirsch@suse.de
+
+- reverted previous patch, which was wrong (bnc #405055)
+
 -------------------------------------------------------------------
 Wed Jul  2 14:01:32 CEST 2008 - sndirsch@suse.de
 

xkeyboard-config.spec

@@ -21,7 +21,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.2
-Release:        45
+Release:        47
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -38,7 +38,6 @@ Patch108:       microsoftnek4k-keycodes.diff
 Patch109:       disable-2xalt_2xctrl-toggle.diff
 Patch110:       MDSW-change-keycode.diff
 Patch111:       unknown-keysym.diff
-Patch112:       cz_sk-dropKPDL.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -74,7 +73,6 @@ Authors:
 %patch109 -p1
 %patch110
 %patch111
-%patch112
 
 %build
 %configure --with-xkb-rules-symlink=xfree86,xorg \
@@ -104,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/X11/xkb/
 
 %changelog
+* Mon Jul 07 2008 sndirsch@suse.de
+- reverted previous patch, which was wrong (bnc #405055)
 * Wed Jul 02 2008 sndirsch@suse.de
 - cz_sk-dropKPDL.diff
   * drop KPDL from cz/sk keyboard layout (bnc #405055, bfo #14479)