[meego-commits] 5858: Changes to devel:x11:Trunk/xorg-x11-server

[Liu Xinyun]

Hi,
I have made the following changes to xorg-x11-server in project devel:x11:Trunk. Please review and accept ASAP.

Thank You,
Liu Xinyun

[This message was auto-generated]

---

Request #5858:

  submit:   home:xyl:branches:devel:x11:Trunk/xorg-x11-server(r4)(cleanup) -> devel:x11:Trunk/xorg-x11-server


Message:
    Fix BMC #3797. Cache XKB comipled file to a proper place.

State:   new          2010-07-19T16:58:41 xyl
Comment: None



changes files:
--------------
--- xorg-x11-server.changes
+++ xorg-x11-server.changes
@@ -0,0 +1,3 @@
+* Tue Jul 20 2010 Liu Xinyun <xinyun.liu at intel.com> - 1.8.99.903
+- Fix BMC #3797. Cache XKB comipled file to a proper place.
+

spec files:
-----------
--- xorg-x11-server.spec
+++ xorg-x11-server.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.17
+# spectacle version 0.18
 # 
 # >> macros
 # << macros
@@ -183,7 +183,7 @@
     --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
     --with-module-dir=%{_libdir}/xorg/modules \
     --with-builderstring="Build ID: %{name} %{version}-%{release}" \
-    --with-xkb-output=%{_localstatedir}/lib/xkb \
+    --with-xkb-output=%{_localstatedir}/cache/xkb \
     --disable-xselinux \
     --disable-xinerama \
     --enable-dri2 \
@@ -243,8 +243,8 @@
 %doc %{_mandir}/man1/Xserver.1*
 %{_libdir}/xorg/protocol.txt
 # dir for caching xkb comp results, must be writable by non-root users
-%dir %attr(777,-,-) %{_localstatedir}/lib/xkb
-%attr(644,-,-) %{_localstatedir}/lib/xkb/README.compiled
+%dir %attr(777,-,-) %{_localstatedir}/cache/xkb
+%attr(644,-,-) %{_localstatedir}/cache/xkb/README.compiled
 # << files common
 
 %files Xorg

other changes:
--------------

++++++ xorg-x11-server.yaml
--- xorg-x11-server.yaml
+++ xorg-x11-server.yaml
@@ -86,7 +86,7 @@
     - --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins"
     - --with-module-dir=%{_libdir}/xorg/modules
     - '--with-builderstring="Build ID: %{name} %{version}-%{release}"'
-    - --with-xkb-output=%{_localstatedir}/lib/xkb
+    - --with-xkb-output=%{_localstatedir}/cache/xkb
     - --disable-xselinux
     - --disable-xinerama
     - --enable-dri2