Add obsoletes tags for simulator-opengl

diff --git a/packaging/mesa.changes b/packaging/mesa.changes
index dd28c21..5b7cd8f 100644 (file)
--- a/packaging/mesa.changes
+++ b/packaging/mesa.changes
@@ -1,3 +1,8 @@
+* Wed Jun 20 2012 Rusty Lynch <rusty.lynch@intel.com> 8.1.0+1+5f3f6
+- Adding Obsoletes tags for simulator-opengl to fix build breakage
+  caused by packages that explicitly attempt to pulling the simulator-opengl
+  package when building on Intel.
+
 * Tue Jun 12 2012 Rusty Lynch <rusty.lynch@intel.com> 8.1.0+1+5f3f6
 - Update to new snapshot from git master
 

diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index 5d834ae..9eec8a6 100644 (file)
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -72,6 +72,7 @@ Group:      System/Libraries
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides:   libGL = %{version}-%{release}
+Obsoletes: simulator-opengl
 
 %description libGL
 Mesa libGL runtime library.
@@ -182,6 +183,7 @@ Group:      Development/Libraries
 Requires:   mesa-libGL = %{version}-%{release}
 Requires:   libx11-devel
 Provides:   libGL-devel
+Obsoletes:  simulator-opengl-devel
 
 %description libGL-devel
 Mesa OpenGL library development package