rpms/xkeyboard-config/devel xkeyboard-config-1.4-battery.patch, NONE, 1.1 xkeyboard-config.spec, 1.24, 1.25

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8751

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-battery.patch 
Log Message:
* Fri Oct 24 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-4
- xkeyboard-config-1.4-battery.patch: add XF86 syms for Battery, Bluetooth,
  Wlan and UWB to usinet.



xkeyboard-config-1.4-battery.patch:

--- NEW FILE xkeyboard-config-1.4-battery.patch ---
diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/inet
--- xkeyboard-config-1.4/symbols/inet.orig	2008-10-24 11:49:36.000000000 +1030
+++ xkeyboard-config-1.4/symbols/inet	2008-10-24 11:49:52.000000000 +1030
@@ -158,9 +158,10 @@ xkb_symbols "evdev" {
     key <I241>   {      [ XF86MailForward       ]       };
     key <I242>   {      [ XF86Save              ]       };
     key <I243>   {      [ XF86Documents         ]       };
-//  key <I244>   {      [ ]       }; // KEY_BATTERY
-//  key <I245>   {      [ ]       }; // KEY_BLUETOOTH
-//  key <I246>   {      [ ]       }; // KEY_WLAN
+    key <I244>   {      [ XF86Battery           ]       }; // KEY_BATTERY
+    key <I245>   {      [ XF86Bluetooth         ]       }; // KEY_BLUETOOTH
+    key <I246>   {      [ XF86WLAN              ]       }; // KEY_WLAN
+    key <I247>   {      [ XF86UWB               ]       }; // KEY_UWB
 //  key <I249>   {      [ ]       }; // KEY_VIDEO_NEXT  --  drive next video source
 //  key <I250>   {      [ ]       }; // KEY_VIDEO_PREV  --  drive previous video source
 //  key <I251>   {      [ ]       }; // KEY_BRIGHTNESS_CYCLE  --  bright up, max++ == min


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- xkeyboard-config.spec	15 Oct 2008 03:10:15 -0000	1.24
+++ xkeyboard-config.spec	24 Oct 2008 04:28:23 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -15,6 +15,8 @@
 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
 
 BuildArch: noarch
 
@@ -47,6 +49,7 @@
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
 %patch3 -p1 -b .tj-variants
+%patch4 -p1 -b .battery
 
 %build
 %configure \
@@ -86,6 +89,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri Oct 24 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-4
+- xkeyboard-config-1.4-battery.patch: add XF86 syms for Battery, Bluetooth,
+  Wlan and UWB to usinet.
+
 * Tue Oct 14 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-3
 - xkeyboard-config-1.4-tj-variant.patch: add legacy and basic tj layouts
   (#455796)