SPECS: Mesa.spec - up to 7.1 rc1

[arekm]

Author: arekm                        Date: Wed May 28 20:49:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 7.1 rc1

---- Files affected:
SPECS:
   Mesa.spec (1.168 -> 1.169) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.168 SPECS/Mesa.spec:1.169
--- SPECS/Mesa.spec:1.168	Sat Apr  5 22:44:31 2008
+++ SPECS/Mesa.spec	Wed May 28 22:49:17 2008
@@ -9,17 +9,21 @@
 %bcond_with	multigl	# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 %bcond_with	nouveau	# build nouveau DRI driver
 #
+%define	snap	rc1
+#
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	7.0.3
-Release:	2%{?with_multigl:.mgl}
+Version:	7.1
+Release:	0.%{?with_multigl:.mgl}.%{snap}.1
 License:	MIT (core), SGI (GLU,libGLw) and others - see license.html file
 Group:		X11/Libraries
-Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5:	e6e6379d7793af40a6bc3ce1bace572e
-Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5:	47fd6863621d3c9c7dbb870ab7f0c303
+# Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
+Source0:	http://www.mesa3d.org/beta/%{name}Lib-%{version}-%{snap}.tar.gz
+# Source0-md5:	94afea4c826badcb5e69e38935a56212
+# Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
+Source1:	http://www.mesa3d.org/beta/%{name}Demos-%{version}-%{snap}.tar.gz
+# Source1-md5:	e3df10e4efa3ff3fc3b2572f8af06f12
 Source2:	nouveau_drm.h
 Patch0:		%{name}-realclean.patch
 URL:		http://www.mesa3d.org/
@@ -582,10 +586,11 @@
 Sterowniki X.org DRI dla rodziny kart VIA Unichrome.
 
 %prep
-%setup -q -b1
+%setup -q -b1 -n %{name}-%{version}-%{snap}
 %patch0 -p0
 
 # until new libdrm release and Mesa update for nouveau_drm patchlevel
+[ -f src/mesa/drivers/dri/nouveau/nouveau_drm.h  ] && exit 1
 cp %{SOURCE2} src/mesa/drivers/dri/nouveau
 
 # fix demos
@@ -804,7 +809,7 @@
 %files libOSMesa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOSMesa.so.6
+%attr(755,root,root) %ghost %{_libdir}/libOSMesa.so.[0-9]
 
 %files libOSMesa-devel
 %defattr(644,root,root,755)
@@ -861,7 +866,6 @@
 %files dri-driver-intel-i915
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i915tex_dri.so
 
 %files dri-driver-intel-i965
 %defattr(644,root,root,755)
@@ -913,6 +917,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.169  2008-05-28 20:49:17  arekm
+- up to 7.1 rc1
+
 Revision 1.168  2008-04-05 20:44:31  arekm
 - rel 2; glw.pc is back
 
================================================================

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