Stefan Dirsch
245641052a
- remove xkeyboard-config.inet.patch:
* There is an entry for KP_Equal in inet(apple) already:
key <KPEQ> { [ KP_Equal ] };
With the macintosh keycodes <KPEQ> has the same value as
<K59> in the xfree86 keycodes file (i.e. 157).
- place all SUSE specific patches into one file:
* add Multi_key for compose.
* add ctrl-alt-backspace server termination key sequence.
- remove xkeyboard-config.macintosh.patch:
This can be handled by adding:
altwin:swap_lalt_lwin,lv3:alt_switch
as option for instance to the keyboard mappings for macintosh.
The xorg-x11 package will be updated accordingly.
- Remove xkeyboard-config.inet.microsoftpro.patch:
This patch is bogus and not needed for evedev keyboards any
more.
For old style keyboard +inet(microsoftprousb) specified the
augmentation used for a specific keyboard model. This this
keyboard model should be set instead ie:
setxkbmap -rules base -model microsfortprousb -layout <lo> -option ""
produces the same results as:
setxkbmap -rules base -model pc104 -layout <lo> -option inet:microsoftpro
(disregarding the geometry part which is rather irrelevant here).
- IBM Space Saver keyboard support was added upstream with
commit b69a8bd.
- Remove special handling for the microsoftnek4k
keyboard. This is handled correctly in evdev
already.
OBS-URL: https://build.opensuse.org/request/show/71186
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=70
93 lines
2.9 KiB
RPMSpec
93 lines
2.9 KiB
RPMSpec
#
|
|
# spec file for package xkeyboard-config
|
|
#
|
|
# Copyright (c) 2011 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
|
|
# upon. The license for this file, and modifications and additions to the
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
# license for the pristine package is not an Open Source License, in which
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
# published by the Open Source Initiative.
|
|
|
|
# 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
|
|
Url: http://www.freedesktop.org/Software/XKeyboardConfig
|
|
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: 2.2.1
|
|
Release: 1
|
|
Summary: The X Keyboard Extension
|
|
Source: %name-%version.tar.bz2
|
|
Patch100: p_suse.diff
|
|
Patch109: disable-2xalt_2xctrl-toggle.diff
|
|
Patch110: MDSW-change-keycode.diff
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
BuildArch: noarch
|
|
|
|
%description
|
|
The X Keyboard Extension essentially replaces the core protocol
|
|
definition of keyboard. The extension makes possible to clearly and
|
|
explicitly specify most aspects of keyboard behaviour on per-key basis
|
|
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 <pascal@info.tsu.ru>
|
|
Sergey V. Udaltsov <svu@users.sourceforge.net>
|
|
|
|
%prep
|
|
%setup -q
|
|
translation-update-upstream
|
|
%patch100
|
|
%patch109 -p1
|
|
%patch110
|
|
|
|
%build
|
|
%configure --with-xkb-rules-symlink=xfree86,xorg \
|
|
--with-xkb-base=/usr/share/X11/xkb \
|
|
--enable-compat_rules \
|
|
--disable-runtime-deps \
|
|
--disable-xkbcomp-symlink
|
|
rm -f */*.dir
|
|
make
|
|
|
|
%install
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
mkdir -p $RPM_BUILD_ROOT/var/lib/xkb
|
|
ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp
|
|
# Bug 335553
|
|
mkdir -p $RPM_BUILD_ROOT/var/lib/xkb/compiled/
|
|
ln -snf /var/lib/xkb/compiled/ $RPM_BUILD_ROOT/usr/share/X11/xkb/compiled
|
|
%find_lang %name
|
|
%fdupes -s $RPM_BUILD_ROOT/usr/share/X11/xkb
|
|
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
%files -f %name.lang
|
|
%defattr(-,root,root)
|
|
%doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
|
|
%dir /var/lib/xkb
|
|
%dir /var/lib/xkb/compiled
|
|
/usr/share/X11/xkb/
|
|
%{_datadir}/pkgconfig/*.pc
|
|
|
|
%changelog
|