From 17a58636244ff63c462ae3f67125d2c89438779f04d3a29d42107efd7308651d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 15 Mar 2007 00:44:44 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=5

---
 Mesa.changes   |  6 ++++++
 Mesa.spec      | 12 ++++++------
 README.updates | 12 +++++-------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index 1b64d8f..b177e70 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 14 08:12:52 CET 2007 - sndirsch@suse.de
+
+- removed libIndirectGL.so (Bug #254317)
+- README.updates: new location of DRI drivers (Bug #254318)
+
 -------------------------------------------------------------------
 Thu Jan 25 00:19:11 CET 2007 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 504781f..ec99d56 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -19,7 +19,7 @@ Provides:       xorg-x11-Mesa
 Obsoletes:      xorg-x11-Mesa
 Autoreqprov:    on
 Version:        6.5.2
-Release:        15
+Release:        20
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.*
 Source:         Mesa-%{version}.tar.bz2
 Source3:        README.updates
@@ -128,7 +128,7 @@ patch -p0 -s < $RPM_SOURCE_DIR/libIndirectGL.diff
 make realclean
 make linux-indirect OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}
-cp -a lib/libIndirectGL.so* $RPM_BUILD_ROOT/usr/%{_lib}
+cp -a lib/libIndirectGL.so.* $RPM_BUILD_ROOT/usr/%{_lib}
 patch -p0 -s -R < $RPM_SOURCE_DIR/libIndirectGL.diff
 %endif
 for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
@@ -224,9 +224,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 /usr/%{_lib}/libGLU.so
-%ifnarch s390 s390x ppc64
-/usr/%{_lib}/libIndirectGL.so
-%endif
 /usr/%{_lib}/libOSMesa.so
 %{_mandir}/man3/*
 
@@ -236,7 +233,10 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libGLU.a
 /usr/%{_lib}/libMesaGL.a
 
-%changelog -n Mesa
+%changelog
+* Wed Mar 14 2007 - sndirsch@suse.de
+- removed libIndirectGL.so (Bug #254317)
+- README.updates: new location of DRI drivers (Bug #254318)
 * Thu Jan 25 2007 - sndirsch@suse.de
 - fixed build on ppc64/s390/s390x
 * Thu Jan 18 2007 - sndirsch@suse.de
diff --git a/README.updates b/README.updates
index 44c5b3a..61e1a9d 100644
--- a/README.updates
+++ b/README.updates
@@ -1,12 +1,10 @@
 DRI Driver update mechanism
 ---------------------------
 
-If any corresponding DRI driver is found in
-"/usr/X11R6/lib/modules/dri/updates/" it will be favored over the one
-in "/usr/X11R6/lib/modules/dri/" and will be used for 32/64 bit
-applications.
+If any corresponding DRI driver is found in "/usr/lib/dri/updates/"
+it will be favored over the one in "/usr/lib/dri/" and will be used
+for 32/64 bit applications.
 
 On 32/64 bit biarch platforms additionally a corresponding DRI driver
-in "/usr/X11R6/lib64/modules/dri/updates/" will be favored over the
-one in "/usr/X11R6/lib64/modules/dri/" and will be used for 64bit
-applications.
+in "/usr/lib64/dri/updates/" will be favored over the one in 
+"/usr/lib64/dri/" and will be used for 64bit applications.