packages: xorg-xserver-server/xorg-xserver-server.spec - updated some exten...

[qboosh]

Author: qboosh                       Date: Sat Aug 20 08:29:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated some extension bconds
- dbus-x11 moved to Suggests (not started by Xserver itself, required by some WMs/DMs)

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

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.284 packages/xorg-xserver-server/xorg-xserver-server.spec:1.285
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.284	Fri Aug 19 10:26:29 2011
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Sat Aug 20 10:28:56 2011
@@ -1,13 +1,17 @@
 # $Revision$, $Date$
+# TODO: consider XSELINUX
 #
 # Conditional build:
-%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_with	hal	# HAL support
-%bcond_without	udev	# UDEV support
-%bcond_without	dmx	# DMX support
-%bcond_without	record	# RECORD extension
+%bcond_with	multigl		# package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
+%bcond_with	dbus		# D-BUS support for configuration (if no udev)
+%bcond_with	hal		# HAL support for configuration (if no udev)
+%bcond_without	udev		# UDEV support for configuration
+%bcond_without	dri2		# DRI2 extension
+%bcond_without	dmx		# DMX support
+%bcond_without	record		# RECORD extension
+%bcond_with	xcsecurity	# XC-SECURITY extension (deprecated)
+%bcond_with	xf86bigfont	# XF86BigFont extension
+%bcond_with	xselinux	# SELinux extension
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define	xorg_xserver_server_ansic_abi		0.4
@@ -39,6 +43,7 @@
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires:	OpenGL-GLX-devel
+%{?with_xselinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	cpp
@@ -49,6 +54,7 @@
 %endif
 %{?with_hal:BuildRequires:	hal-devel}
 BuildRequires:	libdrm-devel >= 2.4.5
+%{?with_xselinux:BuildRequires:	libselinux-devel >= 2.0.86}
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
@@ -103,7 +109,7 @@
 BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel >= 1.2.0
 BuildRequires:	xorg-proto-xextproto-devel >= 1:7.2.0
-BuildRequires:	xorg-proto-xf86bigfontproto-devel >= 1.2.0
+%{?with_xf86bigfont:BuildRequires:	xorg-proto-xf86bigfontproto-devel >= 1.2.0}
 BuildRequires:	xorg-proto-xf86dgaproto-devel >= 2.0.99.1
 BuildRequires:	xorg-proto-xf86driproto-devel >= 2.1.0
 BuildRequires:	xorg-proto-xf86miscproto-devel
@@ -118,7 +124,6 @@
 Requires:	pixman >= 0.16.0
 Requires:	xkeyboard-config
 # for rgb.txt
-Requires:	dbus-x11
 Requires:	xorg-app-rgb >= 0.99.3
 Requires:	xorg-app-xkbcomp
 %{?with_hal:Suggests:	hal}
@@ -129,6 +134,7 @@
 Requires:	xorg-font-font-alias
 Requires:	xorg-font-font-cursor-misc
 Requires:	xorg-font-font-misc-misc-base >= 1.0.0-0.3
+Suggests:	dbus-x11 >= 1.0
 Suggests:	xkeyboard-config
 Provides:	xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
 Provides:	xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi}
@@ -295,7 +301,7 @@
 Requires:	pixman-devel >= 0.16.0
 Requires:	xorg-lib-libpciaccess-devel >= 0.8.0
 Requires:	xorg-lib-libxkbfile-devel
-Requires:	xorg-proto-dri2proto-devel >= 2.3
+%{?with_dri2:Requires:	xorg-proto-dri2proto-devel >= 2.3}
 Requires:	xorg-proto-fontsproto-devel
 Requires:	xorg-proto-inputproto-devel >= 1.9.99.902
 Requires:	xorg-proto-kbproto-devel >= 1.0.3
@@ -414,9 +420,9 @@
 	--with-os-name="PLD/Linux" \
 	--with-os-vendor="PLD/Team" \
 	--without-fop \
-	--%{?with_dbus:en}%{!?with_dbus:dis}able-config-dbus \
-	%{!?with_hal:--disable-config-hal} \
-	--%{?with_udev:en}%{!?with_udev:dis}able-config-udev \
+	%{?with_dbus:--enable-config-dbus} \
+	--enable-config-hal%{!?with_hal:=no} \
+	--enable-config-udev%{!?with_udev:=no} \
 	--enable-aiglx \
 	--enable-builddocs \
 	--enable-dga \
@@ -425,8 +431,11 @@
 	--enable-install-libxf86config \
 	%{?with_record:--enable-record} \
 	--enable-kdrive \
+	%{?with_xcsecurity:--enable-xcsecurity} \
 	--enable-xephyr \
+	%{?with_xf86bigfont:--enable-xf86bigfont} \
 	--enable-xfbdev \
+	%{?with_xselinux:--enable-xselinux} \
 	--enable-glx-tls \
 	--disable-xfake \
 	--enable-secure-rpc \
@@ -621,6 +630,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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)
+
 Revision 1.284  2011/08/19 08:26:29  lmasko
 - Up to 1.10.4.
 
================================================================

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