From 02d5af6521a7886d94cb668402b70d79d3046c23432d50e506a6276ca4d46348 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 16 Sep 2009 20:22:03 +0000 Subject: [PATCH] Accepting request 20386 from X11:XOrg Copy from X11:XOrg/Mesa based on submit request 20386 from user sndirsch OBS-URL: https://build.opensuse.org/request/show/20386 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=71 --- Mesa.changes | 6 ++++++ Mesa.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index 67639bf..45e897c 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 11 15:21:56 CEST 2009 - sndirsch@suse.de + +- no longer package glew headers in Mesa-devel, which caused file + conflicts with glew-devel (bnc #538344) + ------------------------------------------------------------------- Fri Sep 4 00:02:13 CEST 2009 - sndirsch@suse.de diff --git a/Mesa.spec b/Mesa.spec index aa2240f..1747dc1 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -33,7 +33,7 @@ Obsoletes: Mesa-64bit %endif # Version: 7.5.1 -Release: 1 +Release: 2 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 @@ -206,9 +206,9 @@ rm -rf $RPM_BUILD_ROOT /usr/include/GL/wmesa.h /usr/include/GL/internal/dri_interface.h /usr/include/GL/wglext.h -/usr/include/GL/glew.h -/usr/include/GL/glxew.h -/usr/include/GL/wglew.h +%exclude /usr/include/GL/glew.h +%exclude /usr/include/GL/glxew.h +%exclude /usr/include/GL/wglew.h /usr/%{_lib}/libGLU.so /usr/%{_lib}/libOSMesa.so /usr/%{_lib}/libEGL.so