SPECS: Mesa.spec - add glut - take libGL from the DRI build (I gue...

[jpc]

Author: jpc                          Date: Fri Oct 21 01:01:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add glut
- take libGL from the DRI build (I guess this could make a difference
  but I can't get anything more than software rendering and no output
  from LIBGL_DEBUG=verbose) Help?
- don't build demos (they are not packaged anyway)

---- Files affected:
SPECS:
   Mesa.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.85 SPECS/Mesa.spec:1.86
--- SPECS/Mesa.spec:1.85	Thu Oct 20 21:47:18 2005
+++ SPECS/Mesa.spec	Fri Oct 21 03:01:37 2005
@@ -153,16 +153,17 @@
 	CXX="%{__cxx}" \
 	OPT_FLAGS="%{rpmcflags}" \
 	XLIB_DIR=%{_libdir}
+	PROGRAM_DIRS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/GL,%{_mandir}/man3,%{_examplesdir}/Mesa}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri
 
-cp -df lib-static/lib[GO]* $RPM_BUILD_ROOT%{_libdir}
-cp -df lib/lib[GO]* $RPM_BUILD_ROOT%{_libdir}
+cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir}
+cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir}
+cp -df lib/libOS* $RPM_BUILD_ROOT%{_libdir}
 cp -rf include/GL/{gl*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL
-rm -f $RPM_BUILD_ROOT%{_includedir}/GL/glut*
 cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri
 
 for l in demos redbook samples xdemos ; do
@@ -182,15 +183,17 @@
 %files
 %defattr(644,root,root,755)
 %doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS,X11},RELNOTES*,VERSIONS}
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGLU.so.*.*
+%attr(755,root,root) %{_libdir}/libglut.so.*.*
 %attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*.spec
 %attr(755,root,root) %{_libdir}/libGLU.so
+%attr(755,root,root) %{_libdir}/libglut.so
 %attr(755,root,root) %{_libdir}/libOSMesa.so
 %{_libdir}/libGLw.a
 %dir %{_includedir}/GL
@@ -215,6 +218,7 @@
 %defattr(644,root,root,755)
 %{_libdir}/libGL.a
 %{_libdir}/libGLU.a
+%{_libdir}/libglut.a
 %{_libdir}/libOSMesa.a
 
 %files demos
@@ -232,6 +236,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2005/10/21 01:01:37  jpc
+- add glut
+- take libGL from the DRI build (I guess this could make a difference
+  but I can't get anything more than software rendering and no output
+  from LIBGL_DEBUG=verbose) Help?
+- don't build demos (they are not packaged anyway)
+
 Revision 1.85  2005/10/20 19:47:18  jpc
 - add missing asm files (patch from Gentoo)
 - sort BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Mesa.spec?r1=1.85&r2=1.86&f=u