rpms/mesa/devel mesa.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/mesa/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22826

Modified Files:
	mesa.spec 
Log Message:
Fix file manifest for libGL .so versions


Index: mesa.spec
===================================================================
RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mesa.spec	24 Dec 2005 08:38:45 -0000	1.31
+++ mesa.spec	24 Dec 2005 09:12:21 -0000	1.32
@@ -291,15 +291,18 @@
 
 %files libGL
 %defattr(-,root,root,-)
-%dir %{_libdir}
 %{_libdir}/libGL.so.1
+
+# NOTE: The software libGL is OpenGL 1.5, however the DRI enabled libGL is
+# only OpenGL 1.2
+%if %{with_dri}
 %{_libdir}/libGL.so.1.2
-# x86 DRI modules
+%else
+%{_libdir}/libGL.so.1.5.*
+%endif
+
 %if %{with_dri}
-# NOTE: It is libGL.so.1.2 in DRI builds, and libGL.so.1.5.060400 in non-DRI
-# builds, although it isn't clear what the rationale for this is to me yet,
-# nonetheless, I'm conditionalizing it to get it to build.
-#%{_libdir}/libGL.so.1.2
+# DRI modules
 %dir %{_libdir}/dri
 # NOTE: This is a glob for now, as we explicitly determine and limit the DRI
 # drivers that are installed on a given OS/arch combo in our custom DRI