From 935cfcc76c60f1fd1d295e000ccf67d3deff5865ec1232ec3e07a8526d2185b8 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 23 Aug 2013 11:55:30 +0000
Subject: [PATCH] Accepting request 196096 from home:sumski:branches:X11:XOrg

Update to 9.2 rc2 + small baselibs cleanup

OBS-URL: https://build.opensuse.org/request/show/196096
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=309
---
 Mesa.changes              |  7 +++++++
 Mesa.spec                 |  4 ++--
 MesaLib-9.2.0-rc1.tar.bz2 |  3 ---
 MesaLib-9.2.0-rc2.tar.bz2 |  3 +++
 baselibs.conf             | 26 ++++++++------------------
 5 files changed, 20 insertions(+), 23 deletions(-)
 delete mode 100644 MesaLib-9.2.0-rc1.tar.bz2
 create mode 100644 MesaLib-9.2.0-rc2.tar.bz2

diff --git a/Mesa.changes b/Mesa.changes
index b365dbd..e764920 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 23 10:54:18 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to 9.2 rc2
+ * Documentation, glsl and buildsystem fixes since rc1
+- baselibs.conf cleanup: adjusted to current spec
+
 -------------------------------------------------------------------
 Tue Aug 20 13:12:17 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/Mesa.spec b/Mesa.spec
index 11117ed..b10d0a9 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -29,11 +29,11 @@
 %define llvm_r600 0 
 %endif
 
-%define _version 9.2.0-rc1
+%define _version 9.2.0-rc2
 %define _name_archive MesaLib
 
 Name:           Mesa
-Version:        9.2.0~rc1
+Version:        9.2.0~rc2
 Release:        0
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
diff --git a/MesaLib-9.2.0-rc1.tar.bz2 b/MesaLib-9.2.0-rc1.tar.bz2
deleted file mode 100644
index b2400db..0000000
--- a/MesaLib-9.2.0-rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df426c1354037c3cb9122a4aa53be58de2499730c69be09c6347f1758834f50a
-size 6639264
diff --git a/MesaLib-9.2.0-rc2.tar.bz2 b/MesaLib-9.2.0-rc2.tar.bz2
new file mode 100644
index 0000000..58b0759
--- /dev/null
+++ b/MesaLib-9.2.0-rc2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c455862dda4c49593ab804f7c5c8071ea61ab8f324ef5aa6a69b67c80935ab69
+size 6642555
diff --git a/baselibs.conf b/baselibs.conf
index 18a5ff9..e848fa6 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -4,60 +4,50 @@ Mesa
 	provides  "XFree86-Mesa-<targettype> xorg-x11-Mesa-<targettype>"
 Mesa-devel
 	#We need Mesa-<targettype>!, do not put requires -Mesa-<targettype>.
+	requires "Mesa-<targettype> = <version>"
 	requires "Mesa-libEGL-devel-<targettype> = <version>"
 	requires "Mesa-libGL-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv1_CM-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv2-devel-<targettype> = <version>"
-	#requires "Mesa-libGLESv3-devel-<targettype> = <version>"
-	requires "Mesa-libIndirectGL1-<targettype> = <version>"
 	requires "Mesa-libIndirectGL-devel-<targettype> = <version>"
-	requires "libOSMesa9-<targettype> = <version>"
-	requires "libOSMesa-devel-<targettype> = <version>"
-	requires "libgbm-devel-<targettype>"
-#	requires "libwayland-egl-devel-<targettype> = <version>"
-	requires "Mesa-libglapi0-<targettype> = <version>"
 	requires "Mesa-libglapi-devel-<targettype> = <version>"
+	requires "libOSMesa-devel-<targettype> = <version>"
+	requires "libgbm-devel-<targettype> = <version>"
+    #Activate libwayland-egl-devel once 12.2 is gone
+	#requires "libwayland-egl-devel-<targettype> = <version>"
 	obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 	provides  "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"
 Mesa-libEGL1
 Mesa-libEGL-devel
-	requires -Mesa-libEGL-<targettype>
 	requires "Mesa-libEGL1-<targettype> = <version>"
 Mesa-libGL1
 	requires "Mesa-<targettype>"
 Mesa-libGL-devel
-	requires -Mesa-libGL-<targettype>
 	requires "Mesa-libGL1-<targettype> = <version>"
 Mesa-libGLESv1_CM1
 Mesa-libGLESv1_CM-devel
-	requires -Mesa-libGLESv1_CM-<targettype>
+	requires "Mesa-libEGL1-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv1_CM1-<targettype> = <version>"
 Mesa-libGLESv2-2
 Mesa-libGLESv2-devel
-	requires -Mesa-libGLESv2-<targettype>
+	requires "Mesa-libEGL1-devel-<targettype> = <version>"
 	requires "Mesa-libGLESv2-2-<targettype> = <version>"
 Mesa-libGLESv3-devel
-#	requires -Mesa-libGLESv3-<targettype>
-#	requires "Mesa-libGLESv3-3-<targettype> = <version>"
+	requires "Mesa-libEGL1-devel-<targettype> = <version>"
 Mesa-libIndirectGL1
 Mesa-libIndirectGL-devel
-	requires -Mesa-libIndirectGL-<targettype>
 	requires "Mesa-libIndirectGL1-<targettype> = <version>"
 libOSMesa9
 libOSMesa-devel
-	requires -libOSMesa-<targettype>
 	requires "libOSMesa9-<targettype> = <version>"
 libgbm1
 libgbm-devel
-	requires -libgbm-<targettype>
 	requires "libgbm1-<targettype> = <version>"
 libwayland-egl1  
 libwayland-egl-devel
-	requires -libwayland-egl-<targettype>
 	requires "libwayland-egl1-<targettype> = <version>"
 Mesa-libglapi0
 Mesa-libglapi-devel
-	requires -Mesa-libglapi-<targettype>
 	requires "Mesa-libglapi0-<targettype> = <version>"
 libXvMC_nouveau
 libXvMC_r300