Hello community, here is the log from the commit of package Mesa checked in at Sun Apr 23 00:19:53 CEST 2006. -------- --- Mesa/Mesa.changes 2006-04-13 11:20:21.000000000 +0200 +++ STABLE/Mesa/Mesa.changes 2006-04-22 09:24:44.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 22 09:23:18 CEST 2006 - sndirsch@suse.de + +- licensefix.patch: + * fixed incompatible GPL license (Bug #133238, Mesa Bug #6490) + +------------------------------------------------------------------- New: ---- licensefix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.C7aBLf/_old 2006-04-23 00:19:07.000000000 +0200 +++ /var/tmp/diff_new_pack.C7aBLf/_new 2006-04-23 00:19:07.000000000 +0200 @@ -20,7 +20,7 @@ Obsoletes: xorg-x11-Mesa XFree86-Mesa Autoreqprov: on Version: 6.4.2 -Release: 12 +Release: 15 Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL.* Source: Mesa-%{version}.tar.bz2 Source1: missing-headers.tar.bz2 @@ -36,6 +36,7 @@ Patch7: glxext-sgi-hyperpipe.patch Patch8: mesa-6.4.2-scissor-fix-1.patch Patch9: mesa-6.4.2-dri-copy-sub-buffer-1.patch +Patch10: licensefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -132,6 +133,9 @@ %patch7 -p1 %patch8 %patch9 +pushd src/glu/sgi/libnurbs/internals +%patch10 +popd %build %ifarch %ix86 ppc x86_64 @@ -241,6 +245,9 @@ /usr/%{_lib}/libMesaGL.a %changelog -n Mesa +* Sat Apr 22 2006 - sndirsch@suse.de +- licensefix.patch: + * fixed incompatible GPL license (Bug #133238, Mesa Bug #6490) * Thu Apr 13 2006 - sndirsch@suse.de - added /usr/X11R6/%%{_lib}/modules/dri/updates/README.updates to document DRI driver update mechanism ++++++ licensefix.patch ++++++ Index: monotonizer.h =================================================================== RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/monotonizer.h,v retrieving revision 1.1 diff -u -r1.1 monotonizer.h --- monotonizer.h 17 Mar 2001 00:25:41 -0000 1.1 +++ monotonizer.h 3 Apr 2006 21:55:01 -0000 @@ -1,14 +1,36 @@ -/************************************************************************** - * * - * Copyright (C) 1999, Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs contain * - * unpublished proprietary information of Silicon Graphics, Inc., and * - * are protected by Federal copyright law. They may not be disclosed * - * to third parties or copied or duplicated in any form, in whole or * - * in part, without the prior written consent of Silicon Graphics, Inc. * - * * - **************************************************************************/ +/* +** License Applicability. Except to the extent portions of this file are +** made subject to an alternative license as permitted in the SGI Free +** Software License B, Version 1.1 (the "License"), the contents of this +** file are subject only to the provisions of the License. You may not use +** this file except in compliance with the License. You may obtain a copy +** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 +** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: +** +** http://oss.sgi.com/projects/FreeB +** +** Note that, as provided in the License, the Software is distributed on an +** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS +** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. +** +** Original Code. The Original Code is: OpenGL Sample Implementation, +** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, +** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. +** Copyright in any portions created by third parties is as indicated +** elsewhere herein. All Rights Reserved. +** +** Additional Notice Provisions: The application programming interfaces +** established by SGI in conjunction with the Original Code are The +** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released +** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version +** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X +** Window System(R) (Version 1.3), released October 19, 1998. This software +** was created using the OpenGL(R) version 1.2.1 Sample Implementation +** published by SGI, but has not been independently verified as being +** compliant with the OpenGL(R) version 1.2.1 Specification. +*/ /* * monotonizer.h ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...