--- cauldron/mesa/current/SPECS/mesa.spec	2011/12/14 03:54:57	181477
+++ cauldron/mesa/current/SPECS/mesa.spec	2011/12/14 06:13:43	181478
@@ -23,7 +23,7 @@
 %define relc			0
 %define	name			mesa
 %define version			7.11.2
-%define rel			3
+%define rel			4
 
 %define release			%mkrel %{rel}
 %define src_type tar.bz2
@@ -211,12 +211,8 @@
 Summary:	Mesa DRI drivers
 Group:		System/Libraries
 Conflicts:	%{_lib}MesaGL1 < 7.7-5
-
-%package -n	%{dridrivers}-experimental
-Summary:	Mesa DRI - unstable experimental drivers
-Group:		System/Libraries
-# for dri driver directory
-Requires:       %{dridrivers}
+Obsoletes:	%{_lib}dri-drivers-experimental < 7.11.2-4
+Provides:	%{_lib}dri-drivers-experimental = %{version}-%{release}
 
 %package -n	%{libglname}-devel
 Summary:	Development files for Mesa (OpenGL compatible 3D lib)
@@ -420,15 +416,6 @@
 Mesa is an OpenGL 2.1 compatible 3D graphics library.
 DRI drivers.
 
-%description -n %{dridrivers}-experimental
-Mesa is an OpenGL 2.1 compatible 3D graphics library.
-Experimental unstable DRI drivers.
-
-This package contains experimental DRI drivers for NVIDIA cards, for
-OpenGL acceleration with nouveau driver. These drivers are not stable
-and may crash your system. Please do not report bugs encountered with
-these drivers.
-
 %description -n	%{libglname}-devel
 Mesa is an OpenGL 2.1 compatible 3D graphics library.
 
@@ -520,14 +507,6 @@
 
 chmod +x %{SOURCE5}
 
-# for dri-drivers-experimental
-cat > README.install.urpmi <<EOF
-This package contains experimental DRI drivers for NVIDIA cards, for
-OpenGL acceleration with nouveau driver. These drivers are not stable
-and may crash your system. Please do not report bugs encountered with
-these drivers.
-EOF
-
 %build
 %if %{git}
 ./autogen.sh -v
@@ -587,6 +566,9 @@
 rm -f %{buildroot}/%{_includedir}/GL/glutf90.h
 %endif
 
+# use swrastg if built (Anssi 12/2011)
+[ -e %{buildroot}%{_libdir}/dri/swrastg_dri.so ] && mv %{buildroot}%{_libdir}/dri/swrast{g,}_dri.so
+
 #------------------------------------------------------------------------------
 
 %files
@@ -601,19 +583,6 @@
 %{_libdir}/dri/libdricore.so
 %{_libdir}/dri/libglsl.so
 %{_libdir}/dri/*_dri.so
-%exclude %{_libdir}/dri/nouveau_dri.so
-%ifnarch %arm %mips
-%exclude %{_libdir}/dri/nouveau_vieux_dri.so
-%endif
-%endif
-
-%files -n %{dridrivers}-experimental
-%defattr(-,root,root)
-%doc docs/COPYING
-%doc README.install.urpmi
-%{_libdir}/dri/nouveau_dri.so
-%ifnarch %arm %mips
-%{_libdir}/dri/nouveau_vieux_dri.so
 %endif
 
 %files -n %{libglname}