SPECS: xorg-xserver-server.spec - rel 3; reenable hal (1.5.3 behaves differ...

[arekm]

Author: arekm                        Date: Tue Nov 11 18:53:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; reenable hal (1.5.3 behaves differently for input section so it's safer to enable it); disable xprint permamently (drop bcond)

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.149 -> 1.150) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.149 SPECS/xorg-xserver-server.spec:1.150
--- SPECS/xorg-xserver-server.spec:1.149	Sat Nov  8 01:51:52 2008
+++ SPECS/xorg-xserver-server.spec	Tue Nov 11 19:53:31 2008
@@ -1,10 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	xprint	# Xprint server (broken, upstream doesn't intend to fix it)
 %bcond_with	multigl	# package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_with	dri2	# DRI2 support
-%bcond_with	hal	# HAL support
+%bcond_without	hal	# HAL support
 %bcond_with	record	# RECORD extension
 %bcond_with	xtrap	# XTrap extension (deprecated)
 #
@@ -19,7 +18,7 @@
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
 Version:	1.5.3
-Release:	2%{?with_multigl:.mgl}
+Release:	3%{?with_multigl:.mgl}
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
@@ -356,7 +355,7 @@
 	--enable-xorgcfg \
 	%{?with_xtrap:--enable-xtrap} \
 	--%{?with_dri2:en}%{!?with_dri2:dis}able-dri2 \
-	--%{?with_xprint:en}%{!?with_xprint:dis}able-xprint \
+	--disable-xprint \
 	--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-xkb-output=/var/lib/xkb
@@ -477,14 +476,6 @@
 %attr(755,root,root) %{_bindir}/Xnest
 %{_mandir}/man1/Xnest.1x*
 
-%if %{with xprint}
-%files -n xorg-xserver-Xprt
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/Xprt
-%{_libdir}/X11/xserver
-%{_mandir}/man1/Xprt.1x*
-%endif
-
 %files -n xorg-xserver-Xvfb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Xvfb
@@ -520,6 +511,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.150  2008/11/11 18:53:31  arekm
+- rel 3; reenable hal (1.5.3 behaves differently for input section so it's safer to enable it); disable xprint permamently (drop bcond)
+
 Revision 1.149  2008/11/08 00:51:52  arekm
 - rel 2; exa damage fix from upstream
 
================================================================

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