From b3f2f479acde2ccab90b417c7c8ec32a9001a7c4e96250a0043cfe42a49960de Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 15 Sep 2008 14:36:10 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=23

---
 ucw_suse.diff            | 88 +++++++++++++++-------------------------
 xkeyboard-config.changes |  7 ++++
 xkeyboard-config.spec    |  6 ++-
 3 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/ucw_suse.diff b/ucw_suse.diff
index ea93448..cbf2666 100644
--- a/ucw_suse.diff
+++ b/ucw_suse.diff
@@ -1,6 +1,6 @@
-diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3/po/cs.po
+diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3.suse/po/cs.po
 --- xkeyboard-config-1.3.orig/po/cs.po	2008-05-18 00:57:03.000000000 +0200
-+++ xkeyboard-config-1.3/po/cs.po	2008-09-15 11:40:29.000000000 +0200
++++ xkeyboard-config-1.3.suse/po/cs.po	2008-09-15 11:40:29.000000000 +0200
 @@ -2585,3 +2585,11 @@
  #: ../rules/base.xml.in.h:646
  msgid "qwertz"
@@ -13,9 +13,9 @@ diff -ur xkeyboard-config-1.3.orig/po/cs.po xkeyboard-config-1.3/po/cs.po
 +#: ../rules/base.xml.in.h:648
 +msgid "CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action."
 +msgstr "klávesa CapsLock přepne při stisknutí rozložení, Alt+CapsLock má původní význam capslock."
-diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3/rules/base.lst
+diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3.suse/rules/base.lst
 --- xkeyboard-config-1.3.orig/rules/base.lst	2008-09-12 16:23:05.000000000 +0200
-+++ xkeyboard-config-1.3/rules/base.lst	2008-09-15 11:22:06.000000000 +0200
++++ xkeyboard-config-1.3.suse/rules/base.lst	2008-09-15 11:22:06.000000000 +0200
 @@ -331,6 +331,7 @@
    bksl            cz: With &lt;\|&gt; key
    qwerty          cz: qwerty
@@ -40,9 +40,9 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.lst xkeyboard-config-1.3/rules/bas
    altwin               Alt/Win key behavior
    altwin:menu          Add the standard behavior to Menu key.
    altwin:meta_alt      Alt and Meta are on the Alt keys.
-diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3/rules/base.o_s.part
+diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3.suse/rules/base.o_s.part
 --- xkeyboard-config-1.3.orig/rules/base.o_s.part	2008-04-30 23:12:57.000000000 +0200
-+++ xkeyboard-config-1.3/rules/base.o_s.part	2008-09-15 10:44:39.000000000 +0200
++++ xkeyboard-config-1.3.suse/rules/base.o_s.part	2008-09-15 10:44:39.000000000 +0200
 @@ -12,6 +12,7 @@
    grp:win_switch	=	+group(win_switch)
    grp:lwin_switch	=	+group(lwin_switch)
@@ -59,9 +59,9 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.o_s.part xkeyboard-config-1.3/rule
    ctrl:nocaps		=	+ctrl(nocaps)
    ctrl:swapcaps		=	+ctrl(swapcaps)
    ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
-diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3/rules/base.xml.in
+diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3.suse/rules/base.xml.in
 --- xkeyboard-config-1.3.orig/rules/base.xml.in	2008-09-12 16:23:05.000000000 +0200
-+++ xkeyboard-config-1.3/rules/base.xml.in	2008-09-15 11:36:34.000000000 +0200
++++ xkeyboard-config-1.3.suse/rules/base.xml.in	2008-09-15 15:24:15.000000000 +0200
 @@ -1900,6 +1900,12 @@
              <_description>qwerty, extended Backslash</_description>
            </configItem>
@@ -75,20 +75,20 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3/rules/
        </variantList>
      </layout>
      <layout>
-@@ -3964,6 +3970,12 @@
-         </configItem>
+@@ -3965,6 +3971,12 @@
        </option>
        <option>
-+         <configItem>
-+           <name>grp:caps_switch</name>
-+           <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
-+         </configItem>
-+       </option>
-+       <option>
          <configItem>
++          <name>grp:caps_switch</name>
++          <description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</description>
++        </configItem>
++      </option>
++      <option>
++        <configItem>
            <name>grp:rctrl_switch</name>
            <_description>Right Ctrl key switches layout while pressed.</_description>
-@@ -4364,6 +4377,12 @@
+         </configItem>
+@@ -4364,6 +4376,12 @@
          </configItem>
        </option>
        <option>
@@ -101,42 +101,20 @@ diff -ur xkeyboard-config-1.3.orig/rules/base.xml.in xkeyboard-config-1.3/rules/
          <configItem>
            <name>caps:shiftlock</name>
            <_description>CapsLock toggles Shift so all keys are affected.</_description>
-diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part xkeyboard-config-1.3/rules/compat/base.l2_s.part
---- xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part	2008-05-10 01:17:53.000000000 +0200
-+++ xkeyboard-config-1.3/rules/compat/base.l2_s.part	2008-09-15 11:03:47.000000000 +0200
+diff -ur xkeyboard-config-1.3.orig/rules/compat/layoutRename.lst xkeyboard-config-1.3.suse/rules/compat/layoutRename.lst
+--- xkeyboard-config-1.3.orig/rules/compat/layoutRename.lst	2007-10-04 23:01:47.000000000 +0200
++++ xkeyboard-config-1.3.suse/rules/compat/layoutRename.lst	2008-09-15 15:19:16.000000000 +0200
 @@ -3,6 +3,7 @@
-   bs		=	+ba%(v[2]):2
-   cs		=	+rs%(v[2]):2
-   cz_qwerty		=	+cz(qwerty)%(v[2]):2
-+  cz_ucw		=	+cz(ucw)%(v[2]):2
-   dev		=	+in(deva)%(v[2]):2
-   dvorak		=	+us(dvorak)%(v[2]):2
-   dzdwi		=	+bt%(v[2]):2
-diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part xkeyboard-config-1.3/rules/compat/base.l3_s.part
---- xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part	2008-05-10 01:17:53.000000000 +0200
-+++ xkeyboard-config-1.3/rules/compat/base.l3_s.part	2008-09-15 11:03:52.000000000 +0200
-@@ -3,6 +3,7 @@
-   bs		=	+ba%(v[3]):3
-   cs		=	+rs%(v[3]):3
-   cz_qwerty		=	+cz(qwerty)%(v[3]):3
-+  cz_ucw		=	+cz(ucw)%(v[2]):2
-   dev		=	+in(deva)%(v[3]):3
-   dvorak		=	+us(dvorak)%(v[3]):3
-   dzdwi		=	+bt%(v[3]):3
-diff -ur xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part xkeyboard-config-1.3/rules/compat/base.l4_s.part
---- xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part	2008-05-10 01:17:53.000000000 +0200
-+++ xkeyboard-config-1.3/rules/compat/base.l4_s.part	2008-09-15 11:03:56.000000000 +0200
-@@ -3,6 +3,7 @@
-   bs		=	+ba%(v[4]):4
-   cs		=	+rs%(v[4]):4
-   cz_qwerty		=	+cz(qwerty)%(v[4]):4
-+  cz_ucw		=	+cz(ucw)%(v[2]):2
-   dev		=	+in(deva)%(v[4]):4
-   dvorak		=	+us(dvorak)%(v[4]):4
-   dzdwi		=	+bt%(v[4]):4
-diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3/symbols/capslock
+ bs	ba
+ cs	rs
+ cz_qwerty cz(qwerty)
++cz_ucw cz(ucw)
+ dev	in(deva)
+ dvorak	us(dvorak)
+ dzdwi	bt
+diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3.suse/symbols/capslock
 --- xkeyboard-config-1.3.orig/symbols/capslock	2007-12-27 23:47:04.000000000 +0100
-+++ xkeyboard-config-1.3/symbols/capslock	2008-09-15 14:10:27.000000000 +0200
++++ xkeyboard-config-1.3.suse/symbols/capslock	2008-09-15 14:10:27.000000000 +0200
 @@ -22,3 +22,12 @@
      key <CAPS> {        [       Escape  ]       };
      key <ESC>  {        [     Caps_Lock    ]       };
@@ -150,9 +128,9 @@ diff -ur xkeyboard-config-1.3.orig/symbols/capslock xkeyboard-config-1.3/symbols
 +    };
 +};
 +
-diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3/symbols/cz
+diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3.suse/symbols/cz
 --- xkeyboard-config-1.3.orig/symbols/cz	2008-02-16 01:53:45.000000000 +0100
-+++ xkeyboard-config-1.3/symbols/cz	2008-09-15 14:08:37.000000000 +0200
++++ xkeyboard-config-1.3.suse/symbols/cz	2008-09-15 14:08:37.000000000 +0200
 @@ -103,3 +103,42 @@
  
      key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
@@ -196,9 +174,9 @@ diff -ur xkeyboard-config-1.3.orig/symbols/cz xkeyboard-config-1.3/symbols/cz
 +    key <AB06> { [ncaron,      Ncaron      ] };
 +    key <AB07> { [lacute,      Lacute      ] };
 +};
-diff -ur xkeyboard-config-1.3.orig/symbols/group xkeyboard-config-1.3/symbols/group
+diff -ur xkeyboard-config-1.3.orig/symbols/group xkeyboard-config-1.3.suse/symbols/group
 --- xkeyboard-config-1.3.orig/symbols/group	2008-09-12 16:23:05.000000000 +0200
-+++ xkeyboard-config-1.3/symbols/group	2008-09-15 11:56:19.000000000 +0200
++++ xkeyboard-config-1.3.suse/symbols/group	2008-09-15 11:56:19.000000000 +0200
 @@ -134,6 +134,16 @@
      include "capslock(grouplock)"
  };
diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index f0b23a3..1942e15 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 15 16:24:33 CEST 2008 - sndirsch@suse.de
+
+- updated ucw_suse.diff
+  * patching rules/compat/layoutRename.lst instead of
+    rules/compat/base.l?_s.part (Milan Vancura)
+
 -------------------------------------------------------------------
 Mon Sep 15 14:31:38 CEST 2008 - sndirsch@suse.de
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index c57bbea..4106431 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -28,7 +28,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.3
-Release:        31
+Release:        32
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -110,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Sep 15 2008 sndirsch@suse.de
+- updated ucw_suse.diff
+  * patching rules/compat/layoutRename.lst instead of
+  rules/compat/base.l?_s.part (Milan Vancura)
+* Mon Sep 15 2008 sndirsch@suse.de
 - ucw_suse.diff
   * For a long time (~10 years) UCW keyboard layout is used by
   many Czech people. It is a trivial configuration change not