Accepting request 107639 from home:coolo:branches:openSUSE:Factory

- fix baselibs.conf after update of libOSMesa
- do not put the date in generated code, this breaks build-compare
  for little to no gain as we know the build date from rpm header

OBS-URL: https://build.opensuse.org/request/show/107639
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=201

Mesa-nodate.diff

@@ -0,0 +1,15 @@
+Index: Mesa-7.11.1/src/mesa/main/es_generator.py
+===================================================================
+--- Mesa-7.11.1.orig/src/mesa/main/es_generator.py	2011-11-17 20:45:06.000000000 +0100
++++ Mesa-7.11.1/src/mesa/main/es_generator.py	2012-03-01 09:27:01.392009165 +0100
+@@ -182,9 +182,8 @@ print """/* DO NOT EDIT ****************
+  * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT
+  * API specification file:   %s
+  * GLES version:             %s
+- * date:                     %s
+  */
+-""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S"))
++""" % (program, functionList, version)
+ 
+ # The headers we choose are version-specific.
+ print """

Mesa.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar  1 08:22:41 UTC 2012 - coolo@suse.com
+
+- fix baselibs.conf after update of libOSMesa
+- do not put the date in generated code, this breaks build-compare
+  for little to no gain as we know the build date from rpm header
+
 -------------------------------------------------------------------
 Fri Feb 24 15:12:22 UTC 2012 - sndirsch@suse.com
 

Mesa.spec

@@ -62,11 +62,12 @@ Obsoletes:      Mesa7 < %{version}
 Provides:       intel-i810-Mesa = %{version}
 Obsoletes:      intel-i810-Mesa < %{version}
 Provides:       xorg-x11-Mesa = %{version}
-Obsoletes:      xorg-x11-Mesa < %{version} 
 Obsoletes:      Mesa-nouveau3d
+Obsoletes:      xorg-x11-Mesa < %{version}
 # bug437293
 %ifarch ppc64
-Obsoletes:      XFree86-Mesa-64bit < %{version} Mesa-64bit < %{version}
+Obsoletes:      Mesa-64bit < %{version}
+Obsoletes:      XFree86-Mesa-64bit < %{version}
 Provides:       Mesa-64bit < %{version}
 Provides:       XFree86-Mesa-64bit = %{version}
 %endif
@@ -80,6 +81,8 @@ Source3:        README.updates
 Source4:        manual-pages.tar.bz2
 Source5:        drirc
 Source6:        %name-rpmlintrc
+# PATCH-FIX-OPENSUSE do not put dates in sources to fix build-compare
+Patch1:         Mesa-nodate.diff
 # to be upstreamed
 Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 # already upstream
@@ -110,19 +113,21 @@ Requires:       Mesa-libGLESv1_CM-devel = %version
 Requires:       Mesa-libGLESv2-devel = %version
 Requires:       Mesa-libGLU-devel = %version
 Requires:       Mesa-libIndirectGL1 = %version
-Requires:       libOSMesa8 = %version
 Requires:       Mesa-libglapi0 = %version
+Requires:       libOSMesa8 = %version
 Requires:       libgbm-devel
 # bug437293
 %ifarch ppc64
-Obsoletes:      XFree86-Mesa-devel-64bit < %{version} Mesa-devel-64bit < %{version}
+Obsoletes:      Mesa-devel-64bit < %{version}
+Obsoletes:      XFree86-Mesa-devel-64bit < %{version}
 Provides:       Mesa-devel-64bit = %{version}
 Provides:       XFree86-Mesa-devel-64bit = %{version}
 %endif
 #
 Provides:       Mesa-devel-static = %{version}
 Provides:       xorg-x11-Mesa-devel = %{version}
-Obsoletes:      xorg-x11-Mesa-devel < %{version} Mesa-devel-static < %{version}
+Obsoletes:      Mesa-devel-static < %{version}
+Obsoletes:      xorg-x11-Mesa-devel < %{version}
 
 %description devel
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -354,6 +359,7 @@ packages.
 
 %prep
 %setup -n %{name}-%{_version} -b4 -q
+%patch1 -p1
 # no need to build (GLUT-)Demos
 rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
 # we use freeglut

baselibs.conf

@@ -10,7 +10,7 @@ Mesa-devel
 	requires "Mesa-libGLESv2-devel-<targettype> = <version>"
 	requires "Mesa-libGLU-devel-<targettype> = <version>"
 	requires "Mesa-libIndirectGL1-<targettype> = <version>"
-	requires "libOSMesa7-<targettype> = <version>"
+	requires "libOSMesa8-<targettype> = <version>"
 	requires "libgbm-devel-<targettype>"
 	requires "Mesa-libglapi0-<targettype> = <version>"
 	obsoletes "XFree86-Mesa-devel-<targettype> xorg-x11-Mesa-devel-<targettype>"