SPECS: Mesa.spec - rel 2; disable building nouveau; we don't have ...

[arekm]

Author: arekm                        Date: Sun Nov 25 20:31:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; disable building nouveau; we don't have libdrm for it anyway

---- Files affected:
SPECS:
   Mesa.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.160 SPECS/Mesa.spec:1.161
--- SPECS/Mesa.spec:1.160	Sun Nov 11 19:04:34 2007
+++ SPECS/Mesa.spec	Sun Nov 25 21:31:25 2007
@@ -8,23 +8,27 @@
 # Conditional build:
 %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	nouveau
 #
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
 Version:	7.0.2
-Release:	1%{?with_multigl:.mgl}
+Release:	2%{?with_multigl:.mgl}
 License:	MIT (core), SGI (GLU,libGLw) and others - see COPYRIGHT file
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
 # Source0-md5:	93e6ed7924ff069a4f883b4fce5349dc
 Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
 # Source1-md5:	11a10410bae7be85cf25bc7119966468
-Source2:	nouveau_drm.h
 Patch0:		%{name}-realclean.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	expat-devel
+%if %{with nouveau}
 BuildRequires:	libdrm-devel >= 2.2.0
+%else
+BuildRequires:	libdrm-devel >= 2.3.0
+%endif
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.4d
 %{?with_motif:BuildRequires:	motif-devel}
@@ -517,13 +521,12 @@
 %setup -q -b1
 %patch0 -p0
 
-# until new libdrm release
-cp %{SOURCE2} src/mesa/drivers/dri/nouveau
-
 # fix demos
 find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/%{name}-%{version}/images/,g"
 
+%if %{with nouveau}
 sed -i -e 's/ ffb$/ ffb nouveau/' configs/linux-dri
+%endif
 
 %ifnarch sparc sparcv9 sparc64
 # for sunffb driver - useful on sparc only
@@ -773,9 +776,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mga_dri.so
 
+%if %{with nouveau}
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
+%endif
 
 %files dri-driver-s3virge
 %defattr(644,root,root,755)
@@ -813,6 +818,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2007-11-25 20:31:25  arekm
+- rel 2; disable building nouveau; we don't have libdrm for it anyway
+
 Revision 1.160  2007-11-11 18:04:34  arekm
 - up to 7.0.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/Mesa.spec?r1=1.160&r2=1.161&f=u