Hello community, here is the log from the commit of package Mesa checked in at Mon May 28 23:30:07 CEST 2007. -------- --- Mesa/Mesa.changes 2007-05-26 15:29:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2007-05-28 21:54:11.075849000 +0200 @@ -1,0 +2,6 @@ +Mon May 28 21:49:36 CEST 2007 - sndirsch@suse.de + +- move GL headers, which conflict with GL headers of NVIDIA driver, + from Mesa-devel back to Mesa; this still make rpmlint happy + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.U10007/_old 2007-05-28 23:27:28.000000000 +0200 +++ /var/tmp/diff_new_pack.U10007/_new 2007-05-28 23:27:28.000000000 +0200 @@ -19,7 +19,7 @@ Obsoletes: xorg-x11-Mesa Autoreqprov: on Version: 6.5.3 -Release: 18 +Release: 20 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: MesaLib-%{version}.tar.bz2 Source1: MesaDemos-%{version}.tar.bz2 @@ -219,6 +219,10 @@ /etc/profile.d/via.* %endif %endif +/usr/include/GL/gl.h +/usr/include/GL/glext.h +/usr/include/GL/glx.h +/usr/include/GL/glxext.h /usr/%{_lib}/libGL.so /usr/%{_lib}/lib*.so.* %ifarch %ix86 x86_64 ppc @@ -231,7 +235,25 @@ %files devel %defattr(-,root,root) %doc docs/*.html docs/*.spec -/usr/include/GL/ +/usr/include/GL/amesa.h +/usr/include/GL/dmesa.h +/usr/include/GL/fxmesa.h +/usr/include/GL/ggimesa.h +/usr/include/GL/gl_mangle.h +/usr/include/GL/glfbdev.h +/usr/include/GL/glu.h +/usr/include/GL/glu_mangle.h +/usr/include/GL/glx_mangle.h +/usr/include/GL/mesa_wgl.h +/usr/include/GL/mglmesa.h +/usr/include/GL/osmesa.h +/usr/include/GL/svgamesa.h +/usr/include/GL/uglmesa.h +/usr/include/GL/vms_x_fix.h +/usr/include/GL/wmesa.h +/usr/include/GL/xmesa.h +/usr/include/GL/xmesa_x.h +/usr/include/GL/xmesa_xf86.h /usr/%{_lib}/libGLU.so /usr/%{_lib}/libOSMesa.so %{_mandir}/man3/* @@ -243,6 +265,9 @@ /usr/%{_lib}/libMesaGL.a %changelog +* Mon May 28 2007 - sndirsch@suse.de +- move GL headers, which conflict with GL headers of NVIDIA driver, + from Mesa-devel back to Mesa; this still make rpmlint happy * Sat May 26 2007 - dmueller@suse.de - add missing ldconfig call to %%post - move include files to -devel package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org