Accepting request 25645 from X11:XOrg

Copy from X11:XOrg/xkeyboard-config based on submit request 25645 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/25645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=31
This commit is contained in:
OBS User autobuild 2009-12-07 14:48:24 +00:00 committed by Git OBS Bridge
parent ce028626f5
commit 4f08627882
3 changed files with 16 additions and 8 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Dec 4 21:14:23 CET 2009 - sndirsch@suse.de
- remove line accidentally left in during patch adaption to fix
macbook again (Ruediger Oertel)
-------------------------------------------------------------------
Tue Nov 17 11:04:20 CET 2009 - sndirsch@suse.de

View File

@ -3,18 +3,20 @@ handle the left contrl/option/apple keys properly.
apple+tab switches window
alt+e gives euro, alt+l gives @, etc
--- rules/base.ml_s.part.orig 2009-09-21 23:23:32.000000000 +0200
+++ rules/base.ml_s.part 2009-11-17 11:17:55.000000000 +0100
@@ -21,6 +21,7 @@
================================================================================
--- rules/base.ml_s.part
+++ rules/base.ml_s.part
@@ -20,7 +20,7 @@
macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
$macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
$thinkpads br = pc+br(thinkpad)
--- rules/base.ml1_s.part.orig 2009-06-09 12:10:01.000000000 +0200
+++ rules/base.ml1_s.part 2009-11-17 11:18:25.000000000 +0100
--- rules/base.ml1_s.part
+++ rules/base.ml1_s.part
@@ -5,6 +5,6 @@
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])

View File

@ -21,14 +21,14 @@
Name: xkeyboard-config
BuildRequires: intltool perl-XML-Parser xorg-x11
Url: http://www.freedesktop.org/Software/XKeyboardConfig
License: GPL v2 or later ; LGPL v2.1 or later ; MIT License (or similar)
License: GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
Group: System/X11/Utilities
Requires: xorg-x11
Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm
AutoReqProv: on
Version: 1.7
Release: 1
Release: 2
Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch