packages: Mesa/Mesa.spec - gallium needs xserver 1.6.0

[qboosh]

Author: qboosh                       Date: Thu Aug 26 06:16:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gallium needs xserver 1.6.0

---- Files affected:
packages/Mesa:
   Mesa.spec (1.251 -> 1.252) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.251 packages/Mesa/Mesa.spec:1.252
--- packages/Mesa/Mesa.spec:1.251	Wed Jun 23 12:05:17 2010
+++ packages/Mesa/Mesa.spec	Thu Aug 26 08:16:29 2010
@@ -6,18 +6,23 @@
 # - subpackage egl?
 #
 # Conditional build:
-%bcond_without	demos	# don't build demos
-%bcond_with	egl	# don't build egl
-%bcond_without	gallium	# don't build gallium
-%bcond_with	gallium_intel # gallium i915 driver (but doesn't work with AIGLX)
-%bcond_with	gallium_nouveau
-%bcond_without	motif	# build static libGLw without Motif interface
-%bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
-%bcond_without	osmesa	# don't build osmesa
-%bcond_with	static
+%bcond_without	demos		# don't build demos
+%bcond_with	egl		# don't build egl
+%bcond_without	gallium		# don't build gallium
+%bcond_with	gallium_intel	# gallium i915 driver (but doesn't work with AIGLX)
+%bcond_with	gallium_nouveau	# gallium nouveau driver
+%bcond_without	motif		# build static libGLw without Motif interface
+%bcond_with	multigl		# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
+%bcond_without	osmesa		# don't build osmesa
+%bcond_with	static		# build static libraries
 #
 # minimal supported xserver version
+%if %{with gallium}
+%define		xserver_ver	1.6.0
+%else
 %define		xserver_ver	1.5.0
+%endif
+
 # glapi version (glapi tables in dri drivers and libglx must be in sync);
 # set to current Mesa version on ABI break, when xserver tables get regenerated
 # (until they start to be somehow versioned themselves)
@@ -64,7 +69,7 @@
 BuildRequires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
 BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 BuildRequires:	xorg-util-makedepend
-BuildRequires:	xorg-xserver-server-devel
+BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{without gallium}
@@ -976,6 +981,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.252  2010/08/26 06:16:29  qboosh
+- gallium needs xserver 1.6.0
+
 Revision 1.251  2010/06/23 10:05:17  patrys
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.251&r2=1.252&f=u