- xkeyboard-config 1.5

.cvsignore

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

sources

@@ -1 +1 @@
-a9fe7efbc67a6966c4d4501f0cf88073  xkeyboard-config-1.4.tar.bz2
+43c74312d303863b1b929554fa9ed9b3  xkeyboard-config-1.5.tar.bz2

usinet.patch

@@ -1,39 +1,38 @@
-From f6b527515a6eb088c7ff6eb66bda454e20df371e Mon Sep 17 00:00:00 2001
+From e0e521d790e050f48c996673820c8be372a9856f Mon Sep 17 00:00:00 2001
 From: Fedora X Ninjas <x@fedoraproject.org>
-Date: Mon, 24 Nov 2008 13:10:56 +1000
+Date: Wed, 28 Jan 2009 12:05:47 +1000
 Subject: [PATCH] Add include inet(media_nav_common) by default for pc105
 
 ---
  rules/base.lists.part |    1 +
- symbols/inet          |    6 ++++++
+ symbols/inet          |    5 +++++
- 2 files changed, 7 insertions(+), 0 deletions(-)
+ 2 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/rules/base.lists.part b/rules/base.lists.part
-index b08ab24..f9207b6 100644
+index e1897b1..1a752eb 100644
 --- a/rules/base.lists.part
 +++ b/rules/base.lists.part
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
                microsoftoffice microsoftmult \
                mx1998 mx2500 mx2750 \
                oretec \
 +              pc105 \
                presario propeller \
                qtronix \
-               rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+               rapidaccess rapidaccess2 thinkpad60 \
 diff --git a/symbols/inet b/symbols/inet
-index 54ec241..568cc4a 100644
+index 339b72d..ba55f43 100644
 --- a/symbols/inet
 +++ b/symbols/inet
-@@ -2234,3 +2234,9 @@ xkb_symbols "classmate" {
+@@ -1797,3 +1797,8 @@ xkb_symbols "compalfl90" {
-     key <I30>   {       [ XF86AudioRaiseVolume  ] };
+     key <II65>  {       [ XF86MonBrightnessDown ]       };
  };
  
-+
 +// Generic
 +partial alphanumeric_keys
 +xkb_symbols "pc105" {
 +    include "inet(media_nav_common)"
 +};
 -- 
-1.6.0.3
+1.6.0.6
 

xkeyboard-config.spec

@@ -3,24 +3,19 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 1.4
+Version: 1.5
-Release: 9%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
-# FDO Bug 17975 (FIXED), taken from git.
-Patch3: xkeyboard-config-1.4-tj-variant.patch
 # Sent to svu, not committed yet (he's waiting for libX11 release)
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
-# RH 470153, FDO Bug 18712 (fixed), taken from git
-Patch6: xkeyboard-config-1.4-abnt2.patch
 
 BuildArch: noarch
 
@@ -102,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Jan 28 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5-1
+- xkeyboard-config 1.5
+
 * Tue Jan 27 2009 Bernie Innocenti <bernie@codewiz.org> 1.4-9
 - Backport fix for the it(olpc) layout