SPECS: xorg-xserver-server.spec - set xkb output dir to /var/lib/x...

[qboosh]

Author: qboosh                       Date: Sun Dec  3 15:31:49 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- set xkb output dir to /var/lib/xkb (written at runtime, so cannot be in /usr)

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.62 SPECS/xorg-xserver-server.spec:1.63
--- SPECS/xorg-xserver-server.spec:1.62	Sun Dec  3 16:04:48 2006
+++ SPECS/xorg-xserver-server.spec	Sun Dec  3 16:31:44 2006
@@ -2,8 +2,11 @@
 # NOTE:
 # - DMX is broken at this moment (so --disable-dmx added for now)
 # - same for xprint
-%bcond_with	dmx
-%bcond_with	xprint
+#
+# Conditional build:
+%bcond_with	dmx		# Xdmx server
+%bcond_with	xprint		# Xprint server
+#
 Summary:	X.org server
 Summary(pl):	Serwer X.org
 Name:		xorg-xserver-server
@@ -260,7 +263,8 @@
 	--%{?with_dmx:en}%{!?with_dmx:dis}able-xprint \
 	--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
 	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
-	--with-mesa-source="`pwd`/Mesa-%{mesa_version}"
+	--with-mesa-source="`pwd`/Mesa-%{mesa_version}" \
+	--with-xkb-output=/var/lib/xkb
 
 # workarounds
 sed -i -e 's#CONFIG_H#XXX_MESA_CONFIG_H#g' GL/mesa/main/config.h
@@ -282,10 +286,9 @@
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
 
-# missing includes ?
+# missing include (needed by -driver-keyboard)
 install hw/xfree86/common/xf86Keymap.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Keymap.h
 
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
 %clean
@@ -333,7 +336,8 @@
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
 #%{_datadir}/X11/app-defaults/XOrgCfg
-%{_datadir}/X11/xkb/compiled
+%dir /var/lib/xkb
+/var/lib/xkb/README.compiled
 /etc/dbus-1/system.d/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xserver
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
@@ -407,6 +411,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2006/12/03 15:31:44  qboosh
+- set xkb output dir to /var/lib/xkb (written at runtime, so cannot be in /usr)
+
 Revision 1.62  2006/12/03 15:04:48  qboosh
 - Mesa 6.5.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.62&r2=1.63&f=u