packages: xorg-xserver-server/xorg-xserver-server.spec - Suggest evdev and ...

[glen]

Author: glen                         Date: Fri Jun  5 15:24:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Suggest evdev and friends; adapter

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.187 -> 1.188) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.187 packages/xorg-xserver-server/xorg-xserver-server.spec:1.188
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.187	Wed May 13 19:52:51 2009
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Fri Jun  5 17:23:58 2009
@@ -19,7 +19,7 @@
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
 Version:	1.6.1.901
-Release:	0.1%{?with_multigl:.mgl}
+Release:	0.2%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -111,6 +111,10 @@
 # for rgb.txt
 Requires:	xorg-app-rgb >= 0.99.3
 Requires:	xorg-app-xkbcomp
+# xserver default config expects evdev+dbus+hald
+Suggests:	dbus
+Suggests:	hal
+Suggests:	xorg-driver-input-evdev
 # xserver requires fixed and cursor fonts
 Requires:	xorg-font-font-alias
 Requires:	xorg-font-font-cursor-misc
@@ -195,17 +199,17 @@
 'host' X display. Think Xnest but with support for modern extensions
 like composite, damage and randr.
 
-Unlike Xnest which is an X proxy, i.e.  limited to the
-capabilities of the host X server, Xephyr is a real X server which
-uses the host X server window as "framebuffer" via fast SHM XImages.
+Unlike Xnest which is an X proxy, i.e. limited to the capabilities of
+the host X server, Xephyr is a real X server which uses the host X
+server window as "framebuffer" via fast SHM XImages.
 
 It also has support for 'visually' debugging what the server is
 painting.
 
 %description -n xorg-xserver-Xephyr -l pl.UTF-8
 Xephyr jest serwerem opartym na kdrive wyświetlającym w oknie na
-istniejącym ekranie X. Można o nim myśleć jako o Xnest ze wsparciem
-do wspólczesnych rozszerzeń jak composite, damage i randr.
+istniejącym ekranie X. Można o nim myśleć jako o Xnest ze wsparciem do
+wspólczesnych rozszerzeń jak composite, damage i randr.
 
 %package -n xorg-xserver-Xfbdev
 Summary:	Xfbdev - Linux framebuffer device X server
@@ -213,8 +217,8 @@
 Group:		X11/Servers
 
 %description -n xorg-xserver-Xfbdev
-Xfbdev is a Linux framebuffer device X server based on the
-kdrive X server.
+Xfbdev is a Linux framebuffer device X server based on the kdrive X
+server.
 
 %description -n xorg-xserver-Xfbdev -l pl.UTF-8
 Xfbdev jest serwerem X dla framebuffera opartym na kdrive.
@@ -283,8 +287,8 @@
 Requires:	%{name} = %{version}-%{release}
 Provides:	xorg-xserver-module(dri)
 %if %{without multigl}
-Conflicts:	xorg-driver-video-nvidia
 Conflicts:	xorg-driver-video-fglrx-libdri
+Conflicts:	xorg-driver-video-nvidia
 %endif
 
 %description -n xorg-xserver-libdri
@@ -305,8 +309,8 @@
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
 %if %{without multigl}
-Conflicts:	xorg-driver-video-nvidia
 Conflicts:	xorg-driver-video-fglrx-libglx
+Conflicts:	xorg-driver-video-nvidia
 %endif
 
 %description -n xorg-xserver-libglx
@@ -457,7 +461,7 @@
 %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
-%{?with_dbus:%{_sysconfdir}/dbus-1/system.d/xorg-server.conf}
+%{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf}
 %{_mandir}/man1/Xorg.1x*
 %{_mandir}/man1/Xserver.1x*
 %{_mandir}/man1/cvt.1*
@@ -532,6 +536,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2009/06/05 15:23:58  glen
+- Suggest evdev and friends; adapter
+
 Revision 1.187  2009/05/13 17:52:51  gotar
 - R proper versions in devel subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.187&r2=1.188&f=u