Author: arekm Date: Fri Apr 2 08:05:42 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; try udev instead of hal
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server.spec (1.223 -> 1.224)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.223
packages/xorg-xserver-server/xorg-xserver-server.spec:1.224
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.223 Fri Apr 2
09:45:50 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Fri Apr 2
10:05:37 2010
@@ -4,8 +4,8 @@
%bcond_with multigl # package libglx.so in a way allowing concurrent
install with nvidia/fglrx drivers
%bcond_without dri2 # DRI2 support
%bcond_with dbus # D-BUS support
-%bcond_without hal # HAL support
-%bcond_with udev # UDEV support
+%bcond_with hal # HAL support
+%bcond_without udev # UDEV support
%bcond_without dmx # DMX support
%bcond_with record # RECORD extension
#
@@ -16,7 +16,7 @@
%define xorg_xserver_server_videodrv_abi 7.0
%define xorg_xserver_server_xinput_abi 9.0
-%define rel 1
+%define rel 2
Summary: X.org server
Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
@@ -408,6 +408,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
+%if %{with udev}
+mv $RPM_BUILD_ROOT%{_prefix}/etc/X11/xorg.conf.d/10-evdev.conf
$RPM_BUILD_ROOT/etc/X11/conf.d
+%endif
+
%if %{with multigl}
cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
mv -f libglx.so libglx.so.%{version}
@@ -465,6 +469,9 @@
%config(missingok) /etc/security/console.apps/xserver
%{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf}
%dir /etc/X11/conf.d
+%if %{with udev}
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/conf.d/10-evdev.conf
+%endif
%{_mandir}/man1/Xorg.1x*
%{_mandir}/man1/Xserver.1x*
%{_mandir}/man1/cvt.1*
@@ -539,6 +546,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.224 2010/04/02 08:05:37 arekm
+- rel 2; try udev instead of hal
+
Revision 1.223 2010/04/02 07:45:50 arekm
- up to 1.8.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.223&r2=1.224&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
