From 781d7e4168913c92bd2d601b39fb34a1b714f3b7e17b0b9ea55fca32a79c633a Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 15 Aug 2014 12:43:38 +0000
Subject: [PATCH] - no longer add /usr/%{_lib}/dri/updates to DRI driver search
 path   (FATE#317822)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=391
---
 Mesa.changes  | 6 ++++++
 Mesa.spec     | 6 ++++++
 baselibs.conf | 1 -
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Mesa.changes b/Mesa.changes
index ce17558..720c02b 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 15 12:31:54 UTC 2014 - sndirsch@suse.com
+
+- no longer add /usr/%{_lib}/dri/updates to DRI driver search path
+  (FATE#317822)
+
 -------------------------------------------------------------------
 Thu Aug  7 12:29:38 UTC 2014 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index d0d04c7..446d4fb 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -544,7 +544,11 @@ autoreconf -fi
 %if %egl_gallium
            --enable-gallium-egl \
 %endif
+%if 0%{?suse_version} < 1315
            --with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
+%else
+           --with-dri-searchpath=/usr/%{_lib}/dri \
+%endif
 %ifarch %ix86 x86_64
            --enable-xa \
            --enable-gallium-llvm \
@@ -607,10 +611,12 @@ for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
    make install.man DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_mandir} LIBMANSUFFIX=3gl
  popd
 done
+%if 0%{?suse_version} < 1315
 #DRI driver update mechanism
 mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
 install -m 644 $RPM_SOURCE_DIR/README.updates \
   $RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
+%endif
 
 %fdupes -s $RPM_BUILD_ROOT/%_mandir
 ### disabled for now on request of Coolo
diff --git a/baselibs.conf b/baselibs.conf
index 587ca3e..d340fda 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,5 +1,4 @@
 Mesa
-	+/usr/X11R6/lib(64)?/modules/dri/updates/README.updates
 	obsoletes "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 	provides  "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 	provides "Mesa-libIndirectGL1-<targettype> = <version>"