From 69c914bfc7d2c31e587932fd96ba5a19ec7ddd62e7b2a14025cac486a91d2f7d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 16 Feb 2012 15:19:51 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=72 --- xkeyboard-config.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 0cac2c7..37313e9 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,7 +1,7 @@ # # spec file for package xkeyboard-config # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,14 @@ Name: xkeyboard-config BuildRequires: fdupes intltool perl-XML-Parser pkg-config translation-update-upstream xorg-x11 Url: http://www.freedesktop.org/Software/XKeyboardConfig -License: GPLv2+ ; LGPLv2.1+ ; MIT License (or similar) +License: GPL-2.0+ ; LGPL-2.1+ ; MIT 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: 2.2.1 -Release: 1 +Release: 2 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 Patch100: p_suse.diff From a65ae4cd5feb6d52b4224d544375ce28bfde4cb903c8e7745e9a56bda6f824b9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 13 Apr 2012 10:34:59 +0000 Subject: [PATCH 2/2] Accepting request 113358 from home:vuntz:branches:X11:XOrg Update to 2.5.1 OBS-URL: https://build.opensuse.org/request/show/113358 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=73 --- MDSW-change-keycode.diff | 45 ---------------------------------- xkeyboard-config-2.2.1.tar.bz2 | 3 --- xkeyboard-config-2.5.1.tar.bz2 | 3 +++ xkeyboard-config.changes | 23 +++++++++++++++++ xkeyboard-config.spec | 36 ++++++++++++--------------- 5 files changed, 42 insertions(+), 68 deletions(-) delete mode 100644 MDSW-change-keycode.diff delete mode 100644 xkeyboard-config-2.2.1.tar.bz2 create mode 100644 xkeyboard-config-2.5.1.tar.bz2 diff --git a/MDSW-change-keycode.diff b/MDSW-change-keycode.diff deleted file mode 100644 index 7356a84..0000000 --- a/MDSW-change-keycode.diff +++ /dev/null @@ -1,45 +0,0 @@ -Index: keycodes/xfree86 -=================================================================== ---- keycodes/xfree86.orig -+++ keycodes/xfree86 -@@ -302,6 +302,9 @@ xkb_keycodes "basic" { - // MacBooks generate 0x65 for the lower brightness key - = 101; - -+ // Required for apple/logitech_g15 keyboard -+ = 93; -+ - // Codes generated for scancodes 0x59-0x5f, 0x62-0x76 - = 157; // - = 170; // -@@ -360,7 +363,7 @@ xkb_keycodes "basic" { - // Other codes never generated. The XFree86 ddx never generates - // these codes. - // Thus we can use them as fake keys -- = 93; // -+ = 8; - = 124; // - = 125; // - = 156; // -Index: symbols/inet -=================================================================== ---- symbols/inet.orig -+++ symbols/inet -@@ -1214,7 +1214,7 @@ xkb_symbols "logitech_g15" { - key { [ XF86LaunchC ] }; - key { [ XF86WWW ] }; - key { [ XF86LaunchE ] }; -- key { [ XF86Launch1 ] }; -+ key { [ XF86Launch1 ] }; - key { [ XF86Launch2 ] }; - key { [ XF86Launch8 ] }; - }; -@@ -1751,7 +1751,7 @@ xkb_symbols "apple" { - key { [ F14 ] }; - key { [ F15 ] }; - key { [ XF86Eject ] }; -- key { [ F16 ] }; -+ key { [ F16 ] }; - key { [ KP_Equal ] }; - }; - diff --git a/xkeyboard-config-2.2.1.tar.bz2 b/xkeyboard-config-2.2.1.tar.bz2 deleted file mode 100644 index 113bedb..0000000 --- a/xkeyboard-config-2.2.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0 -size 739766 diff --git a/xkeyboard-config-2.5.1.tar.bz2 b/xkeyboard-config-2.5.1.tar.bz2 new file mode 100644 index 0000000..160c511 --- /dev/null +++ b/xkeyboard-config-2.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92 +size 833871 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 0ac10dd..73f40a6 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Apr 12 07:55:53 UTC 2012 - vuntz@opensuse.org + +- Update to version 2.5.1: + + Updated translations. +- Changes from version 2.5: + + Critical security bug fixed: Grabs and screensavers + + Add option to map Zenkaku_Hankaku to Escape + + 15 bugs fixed + + Updated translations. +- Changes from version 2.4.1: + + Critical bug fixed: many Ctl+Alt combinations broken +- Changes from version 2.4: + + Add option to use RAlt as RCtrl + + 9 bugs fixed + + Updated translations. +- Changes from version 2.3: + + Serious cleanup of descriptions + + Updated translations. +- Drop MDSW-change-keycode.diff: fixed upstream. +- Add pkgconfig(xorg-macros) BuildRequires: new dependency + upstream. + ------------------------------------------------------------------- Mon May 23 21:51:17 UTC 2011 - eich@suse.de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 37313e9..7fccefe 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -15,25 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xkeyboard-config -BuildRequires: fdupes intltool perl-XML-Parser pkg-config translation-update-upstream xorg-x11 +BuildRequires: fdupes +BuildRequires: intltool +BuildRequires: perl-XML-Parser +BuildRequires: pkg-config +BuildRequires: translation-update-upstream +BuildRequires: xorg-x11 +BuildRequires: pkgconfig(xorg-macros) >= 1.12 Url: http://www.freedesktop.org/Software/XKeyboardConfig +Requires: xorg-x11 +Provides: XFree86:/etc/X11/xkb/symbols/us +Provides: xorg-x11:/etc/X11/xkb/symbols/us +PreReq: /bin/ln /bin/rm +Version: 2.5.1 +Release: 0 +Summary: The X Keyboard Extension License: GPL-2.0+ ; LGPL-2.1+ ; MIT 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: 2.2.1 -Release: 2 -Summary: The X Keyboard Extension -Source: %name-%version.tar.bz2 +Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2 Patch100: p_suse.diff +# PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed Patch109: disable-2xalt_2xctrl-toggle.diff -Patch110: MDSW-change-keycode.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,19 +49,11 @@ and to more closely track the logical and physical state of the keyboard. It also includes a number of keyboard controls designed to make keyboards more accessible to people with physical impairments. - - -Authors: --------- - Ivan Pascal - Sergey V. Udaltsov - %prep %setup -q translation-update-upstream %patch100 %patch109 -p1 -%patch110 %build %configure --with-xkb-rules-symlink=xfree86,xorg \