rpms/xorg-x11-drv-keyboard/devel kbd-1.3.0-us-inet.patch, NONE, 1.1 xorg-x11-drv-keyboard.spec, 1.21, 1.22

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31329

Modified Files:
	xorg-x11-drv-keyboard.spec 
Added Files:
	kbd-1.3.0-us-inet.patch 
Log Message:
* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 1.3.0-2
- kbd-1.3.0-us-inet.patch: Switch default layout to us+inet.


kbd-1.3.0-us-inet.patch:

--- NEW FILE kbd-1.3.0-us-inet.patch ---
diff -up xf86-input-keyboard-1.2.2/src/kbd.c.jx xf86-input-keyboard-1.2.2/src/kbd.c
--- xf86-input-keyboard-1.2.2/src/kbd.c.jx	2007-08-20 18:38:24.000000000 -0400
+++ xf86-input-keyboard-1.2.2/src/kbd.c	2008-03-26 14:19:59.000000000 -0400
@@ -149,7 +149,7 @@ static const char *kbdDefaults[] = {
     "AutoRepeat",	"500 30",
     "XkbRules",		__XKBDEFRULES__,
     "XkbModel",		"pc105",
-    "XkbLayout",	"us",
+    "XkbLayout",	"us+inet",
     "Panix106",		"off",
     "CustomKeycodes",	"off",
     NULL


Index: xorg-x11-drv-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-keyboard/devel/xorg-x11-drv-keyboard.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-keyboard.spec	20 Mar 2008 20:08:03 -0000	1.21
+++ xorg-x11-drv-keyboard.spec	26 Mar 2008 18:22:37 -0000	1.22
@@ -2,16 +2,18 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/input
 
-Summary:   Xorg X11 keyboard input driver
-Name:      xorg-x11-drv-keyboard
-Version: 1.3.0
-Release: 1%{?dist}
-URL:       http://www.x.org
-License:   MIT
-Group:     User Interface/X Hardware Support
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    Xorg X11 keyboard input driver
+Name:	    xorg-x11-drv-keyboard
+Version:    1.3.0
+Release:    2%{?dist}
+URL:	    http://www.x.org
+License:    MIT
+Group:	    User Interface/X Hardware Support
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0:    ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+
+Patch0: kbd-1.3.0-us-inet.patch
 
 ExcludeArch: s390 s390x
 
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .inet
 
 %build
 %configure --disable-static
@@ -49,6 +52,9 @@
 #{_mandir}/man4/keyboard.4*
 
 %changelog
+* Wed Mar 26 2008 Adam Jackson <ajax at redhat.com> 1.3.0-2
+- kbd-1.3.0-us-inet.patch: Switch default layout to us+inet.
+
 * Thu Mar 20 2008 Adam Jackson <ajax at redhat.com> 1.3.0-1
 - keyboard 1.3.0