packages: xorg-xserver-server/xorg-xserver-server.spec - xorg-driver-video ...

[glen]

Author: glen                         Date: Fri Aug 26 03:42:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- xorg-driver-video virtual for video drivers
- release 1

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.285 -> 1.286) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.285 packages/xorg-xserver-server/xorg-xserver-server.spec:1.286
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.285	Sat Aug 20 10:28:56 2011
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Fri Aug 26 05:42:54 2011
@@ -134,6 +134,8 @@
 Requires:	xorg-font-font-alias
 Requires:	xorg-font-font-cursor-misc
 Requires:	xorg-font-font-misc-misc-base >= 1.0.0-0.3
+# Requires at least one video driver to run, see xorg.log which one exactly
+Requires	 xorg-driver-video
 Suggests:	dbus-x11 >= 1.0
 Suggests:	xkeyboard-config
 Provides:	xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
@@ -451,7 +453,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install -Dp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
 install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
 install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
@@ -461,12 +463,12 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT/etc/sysconfig
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/Xvfb
-install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/Xvfb
+install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/Xvfb
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/Xvfb
 
 %if %{with multigl}
 cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
@@ -630,6 +632,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.286  2011/08/26 03:42:54  glen
+- xorg-driver-video virtual for video drivers
+- release 1
+
 Revision 1.285  2011/08/20 08:28:56  qboosh
 - updated some extension bconds
 - dbus-x11 moved to Suggests (not started by Xserver itself, required by some WMs/DMs)
================================================================

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