Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory checked in
at 2012-03-06 14:05:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
and /work/SRC/openSUSE:Factory/.Mesa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa", Maintainer is "sndir...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2012-02-25
07:30:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2012-03-06
14:05:34.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 1 08:22:41 UTC 2012 - co...@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
+
+-------------------------------------------------------------------
New:
----
Mesa-nodate.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.VfwsxK/_old 2012-03-06 14:05:36.000000000 +0100
+++ /var/tmp/diff_new_pack.VfwsxK/_new 2012-03-06 14:05:36.000000000 +0100
@@ -62,11 +62,12 @@
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 @@
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-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 @@
%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
++++++ Mesa-nodate.diff ++++++
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 """
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.VfwsxK/_old 2012-03-06 14:05:36.000000000 +0100
+++ /var/tmp/diff_new_pack.VfwsxK/_new 2012-03-06 14:05:36.000000000 +0100
@@ -10,7 +10,7 @@
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>"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
