SPECS: Mesa.spec - don't package libOSMesa as it's currently unusa...

[qboosh]

Author: qboosh                       Date: Mon Aug 27 16:39:30 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't package libOSMesa as it's currently unusable anyway
  (and thus allow using Mesa-libGL-devel with foreign libGL implementations)

---- Files affected:
SPECS:
   Mesa.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.156 SPECS/Mesa.spec:1.157
--- SPECS/Mesa.spec:1.156	Sat Aug 25 20:42:51 2007
+++ SPECS/Mesa.spec	Mon Aug 27 18:39:25 2007
@@ -2,6 +2,7 @@
 #
 # TODO:
 # - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
+# - usable libOSMesa (see monolithic X how to build it? currently needs non-dri libGL)
 # - package OpenGL man pages (from monolith or SGI) somewhere
 #
 # Conditional build:
@@ -581,17 +582,19 @@
 	APP_LIB_DEPS="-L../../lib -lGL -L../../lib-dri -lGLU"
 
 mv -f lib lib-dri
-%{__make} clean \
-	MKDEP=makedepend
-%{__make} realclean
 
-%{__make} linux${targ} \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
-	XLIB_DIR=%{_libdir} \
-	SRC_DIRS="mesa" \
-	PROGRAM_DIRS=
+# non-dri libGL and libOSMesa
+#%{__make} clean \
+#	MKDEP=makedepend
+#%{__make} realclean
+#
+#%{__make} linux${targ} \
+#	CC="%{__cc}" \
+#	CXX="%{__cxx}" \
+#	OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
+#	XLIB_DIR=%{_libdir} \
+#	SRC_DIRS="mesa" \
+#	PROGRAM_DIRS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -600,7 +603,7 @@
 
 cp -df lib-static/lib* $RPM_BUILD_ROOT%{_libdir}
 cp -df lib-dri/lib* $RPM_BUILD_ROOT%{_libdir}
-cp -df lib/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+#cp -df lib/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
 cp -rf include/GL/{gl[!u]*,glu.h,glu_*,osmesa.h,xmesa*} src/glw/GLw*.h $RPM_BUILD_ROOT%{_includedir}/GL
 cp -df lib-dri/*_dri.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri
 
@@ -633,8 +636,6 @@
 %doc docs/{*.html,README.{3DFX,GGI,MITS,QUAKE,THREADS},RELNOTES*}
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
-%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libOSMesa.so.?
 # symlink for binary apps which fail to conform Linux OpenGL ABI
 # (and dlopen libGL.so instead of libGL.so.1)
 %attr(755,root,root) %{_libdir}/libGL.so
@@ -642,7 +643,6 @@
 %files libGL-devel
 %defattr(644,root,root,755)
 %doc docs/*.spec
-%attr(755,root,root) %{_libdir}/libOSMesa.so
 %dir %{_includedir}/GL
 %{_includedir}/GL/gl.h
 %{_includedir}/GL/glext.h
@@ -659,7 +659,14 @@
 %files libGL-static
 %defattr(644,root,root,755)
 %{_libdir}/libGL.a
-%{_libdir}/libOSMesa.a
+
+# libOSMesa (currently unusable with DRI libGL)
+#%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libOSMesa.so.?
+# -devel
+#%attr(755,root,root) %{_libdir}/libOSMesa.so
+# -static
+#%{_libdir}/libOSMesa.a
 
 %files libGLU
 %defattr(644,root,root,755)
@@ -789,6 +796,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2007/08/27 16:39:25  qboosh
+- don't package libOSMesa as it's currently unusable anyway
+  (and thus allow using Mesa-libGL-devel with foreign libGL implementations)
+
 Revision 1.156  2007/08/25 18:42:51  qboosh
 - soname symlinks as ghost
 
================================================================

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