Move keyboard and mouse config file in xorg-x11-server package

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

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

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

diff --git a/packaging/emgd-bin.changes b/packaging/emgd-bin.changes
index c345ff8..a563470 100644 (file)
--- a/packaging/emgd-bin.changes
+++ b/packaging/emgd-bin.changes
@@ -1,3 +1,6 @@
+* Wed Jul 20 2012 Quanxian Wang <quanxian.wang@intel.com> - 2667
+- move keyboard and mouse configuration file to xorg-x11-server
+
 * Wed Jul 18 2012 Quanxian Wang <quanxian.wang@intel.com> - 2667
 - Adding the X configure file for keyboard and mouse 
 

diff --git a/packaging/emgd-bin.spec b/packaging/emgd-bin.spec
index c46ee21..4085d29 100644 (file)
--- a/packaging/emgd-bin.spec
+++ b/packaging/emgd-bin.spec
@@ -34,8 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
 Source0: %{name}-%{version}.tar.bz2
 Source1: emgd-bin.init
 Source2: emgd-bin.service
-Source3: 10-kbd.conf
-Source4: 10-mouse.conf
 
 %description
 EMGD runtime graphics libraries
@@ -90,8 +88,6 @@ install -m 644 -D usr/share/doc/emgd/emgd-cb.conf $RPM_BUILD_ROOT%{_docdir}/%{na
 install -m 644 -D usr/share/doc/emgd/emgd-rv.conf $RPM_BUILD_ROOT%{_docdir}/%{name}/
 install -m 755 -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/emgd-bin.init
 install -m 755 -D %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/systemd/system/emgd-bin.service
-install -m 755 -D %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/
-install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/
 
 install -m 644 -D etc/powervr.ini $RPM_BUILD_ROOT/etc/powervr.ini
 install -m 644 -D usr/share/man/man4/emgd.4.gz $RPM_BUILD_ROOT%{_mandir}/man4/
@@ -265,7 +261,6 @@ fi
 %{_libdir}/xorg/*
 %{_docdir}/%{name}/emgd-*.conf
 /usr/libexec/emgd-bin.init
-/etc/X11/xorg.conf.d/*
 %{_libdir}/systemd/system/emgd-bin.service
 
 %files devel