This commit is contained in:
Matthias Clasen 2008-10-01 16:51:06 +00:00
parent 6adac9bfb9
commit 0cf6ce6baf
3 changed files with 7 additions and 7 deletions

View File

@ -1 +1 @@
xkeyboard-config-1.3.tar.bz2 xkeyboard-config-1.4.tar.bz2

View File

@ -1 +1 @@
d9e9f69f9c6ef5c5a8255cfbe6a57d51 xkeyboard-config-1.3.tar.bz2 a9fe7efbc67a6966c4d4501f0cf88073 xkeyboard-config-1.4.tar.bz2

View File

@ -3,8 +3,8 @@
Summary: xkeyboard-config alternative xkb data files Summary: xkeyboard-config alternative xkb data files
Name: xkeyboard-config Name: xkeyboard-config
Version: 1.3 Version: 1.4
Release: 2%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Patch1: olpc-xkeyboard-config-kz-group.patch Patch1: olpc-xkeyboard-config-kz-group.patch
Patch2: usinet.patch Patch2: usinet.patch
# Bug 241564, FDO bug 17786 (resolved, fixed)
Patch3: xkeyboard-config-1.3-AC11-mapping-is.patch
BuildArch: noarch BuildArch: noarch
@ -45,7 +43,6 @@ xkeyboard-config alternative xkb data files
%setup -q %setup -q
%patch1 -p1 -b .kzgroup %patch1 -p1 -b .kzgroup
%patch2 -p1 -b .usinet %patch2 -p1 -b .usinet
%patch3 -p1 -b .AC11-mapping-is
%build %build
%configure \ %configure \
@ -85,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/xkb/rules/xorg.xml %{_datadir}/X11/xkb/rules/xorg.xml
%changelog %changelog
* Wed OCt 1 2008 Matthias Clasen <mclasen@redhat.com> 1.4-1
- Update to 1.4
* Mon Sep 29 2008 Peter Hutterer <peter.hutterer@redhat.com> - 1.3-2 * Mon Sep 29 2008 Peter Hutterer <peter.hutterer@redhat.com> - 1.3-2
- xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic - xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic
keyboard layout (#241564) keyboard layout (#241564)