Change /opt/etc/X11/xkb to /etc/X11/xkb

xkeyboard-config is changed to xkb rules path from /opt/etc to /etc
xorg-x11-server should be changed consistently

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

diff --git a/packaging/xorg-x11-server.changes b/packaging/xorg-x11-server.changes
index 17438ad..c6a5168 100644 (file)
--- a/packaging/xorg-x11-server.changes
+++ b/packaging/xorg-x11-server.changes
@@ -1,3 +1,7 @@
+* 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
+
 * Wed May 30 2012 Junfeng Dong <junfeng.dong@intel.com>
 - Clean up spec file for packaging.
 

diff --git a/packaging/xorg-x11-server.spec b/packaging/xorg-x11-server.spec
index 74e8220..8ed3a68 100644 (file)
--- a/packaging/xorg-x11-server.spec
+++ b/packaging/xorg-x11-server.spec
@@ -157,8 +157,8 @@ Common files shared among all X servers.
        --disable-kdrive-evdev \
        --without-dtrace \
        --with-os-vendor="Tizen" \
-       --with-xkb-path=/opt/etc/X11/xkb \
-       --with-xkb-output=/opt/etc/X11/xkb \
+       --with-xkb-path=/etc/X11/xkb \
+       --with-xkb-output=/etc/X11/xkb \
        --with-default-font-path="built-ins" \
        --disable-install-setuid \
        --with-sha1=libgcrypt \
@@ -181,7 +181,7 @@ rm -f %{buildroot}/usr/lib/xorg/modules/libwfb.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libxaa.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libwfb.so
 rm -f %{buildroot}/usr/lib/xorg/modules/libxf8_16bpp.so
-rm -f %{buildroot}/opt/etc/X11/xkb/README.compiled
+rm -f %{buildroot}/etc/X11/xkb/README.compiled
 
 
 %remove_docs