Add mouse and keyboard configuration file

Signed-Off-By Quanxian Wang <quanxian.wang@intel.com>

diff --git a/packaging/50-kbd.conf b/packaging/50-kbd.conf
new file mode 100644 (file)
index 0000000..f92cb3c
--- /dev/null
+++ b/packaging/50-kbd.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+       Identifier "kbd catchall"
+       MatchIsKeyboard "on"
+       Driver "evdev"
+EndSection

diff --git a/packaging/51-mouse.conf b/packaging/51-mouse.conf
new file mode 100644 (file)
index 0000000..6ae1922
--- /dev/null
+++ b/packaging/51-mouse.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+       Identifier "mouse catchall"
+       MatchIsPointer "on"
+       Driver "evdev"
+EndSection

diff --git a/packaging/xorg-x11-server.changes b/packaging/xorg-x11-server.changes
index c6a5168..f41f8d3 100644 (file)
--- a/packaging/xorg-x11-server.changes
+++ b/packaging/xorg-x11-server.changes
@@ -1,3 +1,6 @@
+* Fri Jul 20 2012 - Quanxian Wang <quanxian.wang@intel.com> - 0.1.0+1+77c90
+- Add keyboard and mouse configuration file
+
 * Thu Jul  5 2012 - Quanxian Wang <quanxian.wang@intel.com> - 0.1.0+1+77c90
 - xkeyboard-config is changed to xkb rules path from /opt/etc to /etc
   xorg-x11-server should be changed consistently

diff --git a/packaging/xorg-x11-server.spec b/packaging/xorg-x11-server.spec
index 8ed3a68..f2399a5 100644 (file)
--- a/packaging/xorg-x11-server.spec
+++ b/packaging/xorg-x11-server.spec
@@ -10,6 +10,8 @@ Source0:    %{name}-%{version}.tar.gz
 Source100:  10-kbd.conf
 Source101:  10-mouse.conf
 Source102:  64-xorg-xkb.rules
+Source103:  50-kbd.conf
+Source104:  51-mouse.conf
 Source200:  videoabiver
 Source201:  inputabiver
 Source202:  serverminver
@@ -61,8 +63,6 @@ Provides: xorg-x11-server-Xorg
 %description
 Description: %{summary}
 
-
-
 %package devel
 Summary:    SDK for X server driver module development
 Group:      System/X11
@@ -87,14 +87,9 @@ Requires:   %{name} = %{version}-%{release}
 %description common
 Common files shared among all X servers.
 
-
-
-
 %prep
 %setup -q -n %{name}-%{version}
 
-
-
 %build
 
 %reconfigure \
@@ -172,6 +167,11 @@ Common files shared among all X servers.
 make %{?jobs:-j%jobs}
 
 %install
+
+mkdir -p %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE103} %{buildroot}/etc/X11/xorg.conf.d/
+install -m 755 -D %{SOURCE104} %{buildroot}/etc/X11/xorg.conf.d/
+
 %make_install
 
 rm -f %{buildroot}/usr/lib/xorg/modules/multimedia/*
@@ -183,7 +183,6 @@ rm -f %{buildroot}/usr/lib/xorg/modules/libwfb.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libxf8_16bpp.so
 rm -f %{buildroot}/etc/X11/xkb/README.compiled
 
-
 %remove_docs
 
 %files
@@ -199,14 +198,13 @@ rm -f %{buildroot}/etc/X11/xkb/README.compiled
 /usr/lib/xorg/modules/extensions/libglx.so
 /usr/lib/xorg/modules/extensions/libdbe.so
 /usr/lib/xorg/modules/extensions/libdri.so
+/etc/X11/xorg.conf.d/*
 %endif
 %{_libdir}/xorg/modules/extensions/libextmod.so
 %{_libdir}/xorg/modules/extensions/librecord.so
 %dir %{_libdir}/xorg/modules/multimedia
 %{_libdir}/xorg/modules/*.so
 
-
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/xorg-server.pc
@@ -218,4 +216,3 @@ rm -f %{buildroot}/etc/X11/xkb/README.compiled
 %files common
 %defattr(-,root,root,-)
 %{_libdir}/xorg/protocol.txt
-