SPECS (XORG_7_2): xorg-xserver-server.spec - merge from HEAD (whic...

[arekm]

Author: arekm                        Date: Sun Dec  3 15:46:21 2006 GMT
Module: SPECS                         Tag: XORG_7_2
---- Log message:
- merge from HEAD (which is future xorg 7.3) to 7.2 branch

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.53.2.6 -> 1.53.2.7) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.53.2.6 SPECS/xorg-xserver-server.spec:1.53.2.7
--- SPECS/xorg-xserver-server.spec:1.53.2.6	Sun Dec  3 15:01:41 2006
+++ SPECS/xorg-xserver-server.spec	Sun Dec  3 16:46:15 2006
@@ -247,7 +247,8 @@
 	--enable-xevie \
 	--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
 	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
-	--with-mesa-source="`pwd`/Mesa-%{mesa_version}"
+	--with-mesa-source="`pwd`/Mesa-%{mesa_version}" \
+	--with-xkb-output=/var/lib/xkb
 
 %{__make}
 
@@ -312,7 +313,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
 %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
 %config(missingok) /etc/security/console.apps/xserver
@@ -380,6 +382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.7  2006/12/03 15:46:15  arekm
+- merge from HEAD (which is future xorg 7.3) to 7.2 branch
+
 Revision 1.53.2.6  2006/12/03 14:01:41  qboosh
 - -libglx R: -server in strict version
 - added mesa-versioned -libglx(glapi) Provides to -libglx to keep dri drivers in sync
================================================================

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