rpms/PyOpenGL/devel license.txt,NONE,1.1 PyOpenGL.spec,1.12,1.13

Nikolay Vladimirov turki at fedoraproject.org
Fri Jan 2 01:06:11 UTC 2009


Author: turki

Update of /cvs/pkgs/rpms/PyOpenGL/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17250

Modified Files:
	PyOpenGL.spec 
Added Files:
	license.txt 
Log Message:
Even More packaging fixes for b8


--- NEW FILE license.txt ---
OpenGL-ctypes License

	Copyright (c) 2005-2007, Michael C. Fletcher and Contributors
	All rights reserved.
	
	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	
		Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	
		Redistributions in binary form must reproduce the above
		copyright notice, this list of conditions and the following
		disclaimer in the documentation and/or other materials
		provided with the distribution.
	
		The name of Michael C. Fletcher, or the name of any Contributor,
		may not be used to endorse or promote products derived from this 
		software without specific prior written permission.
	
	THIS SOFTWARE IS NOT FAULT TOLERANT AND SHOULD NOT BE USED IN ANY
	SITUATION ENDANGERING HUMAN LIFE OR PROPERTY.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
	OF THE POSSIBILITY OF SUCH DAMAGE. 

OpenGL-ctypes includes code from the PyOpenGL 2.x series licensed under
version 3 of the PyOpenGL License (BSD-style):

	PyOpenGL License (v3)

	PyOpenGL is based on PyOpenGL 1.5.5, Copyright © 1997-1998 by
	James Hugunin, Cambridge MA, USA, Thomas Schwaller, Munich, Germany
	and David Ascher, San Francisco CA, USA.

	Contributors to the PyOpenGL project in addition to those listed 
	above include:
		* David Konerding
		* Soren Renner
		* Rene Liebscher
		* Randall Hopper
		* Michael Fletcher
		* Thomas Malik
		* Thomas Hamelryck
		* Jack Jansen
		* Michel Sanner
		* Tarn Weisner Burton
		* Andrew Cox
		* Rene Dudfield

	PyOpenGL is Copyright (c) 1997-1998, 2000-2006 by the contributors.

	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions are
	met:
	
	* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
	* Redistributions in binary form must reproduce the above copyright
		notice, this list of conditions and the following disclaimer in
		the documentation and/or other materials provided with the
		distribution.
	* The names of the contributors may not be used to endorse or
		promote products derived from this software without specific prior
		written permission.
	
	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
	OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
	ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
	TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
	USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
	DAMAGE.

OpenGL-ctypes includes code from the Pyglet project, licensed under the 
Pyglet License (BSD Style):

	Copyright (c) 2006-2008 Alex Holkner
	All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions 
	are met:
	
	* Redistributions of source code must retain the above copyright
	   notice, this list of conditions and the following disclaimer.
	 * Redistributions in binary form must reproduce the above copyright 
	   notice, this list of conditions and the following disclaimer in
	   the documentation and/or other materials provided with the
	   distribution.
	 * Neither the name of pyglet nor the names of its
	   contributors may be used to endorse or promote products
	   derived from this software without specific prior written
	   permission.

	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	POSSIBILITY OF SUCH DAMAGE.



Index: PyOpenGL.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyOpenGL/devel/PyOpenGL.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PyOpenGL.spec	2 Jan 2009 00:08:00 -0000	1.12
+++ PyOpenGL.spec	2 Jan 2009 01:05:40 -0000	1.13
@@ -9,14 +9,16 @@
 Group:          System Environment/Libraries
 URL:            http://pyopengl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/pyopengl/%{name}-%{version}%{prever}.tar.gz
+Source1:	license.txt
 Patch0:         PyOpenGL-3.0.0a6-shebang.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel python-setuptools-devel
 BuildArch:      noarch
-Requires:       python-numeric python-setuptools libGL libGLU freeglut
+Requires:       python-numeric python-setuptools freeglut
 # in some other repositories this is named python-opengl
 Provides:       python-opengl = %{version}-%{release}
 Obsoletes:      python-opengl < %{version}-%{release}
+Obsoletes:	PyOpenGL-doc
 
 %description
 PyOpenGL is the cross platform Python binding to OpenGL and related APIs. It
@@ -36,20 +38,10 @@
 %description Tk
 %{name} Togl (Tk OpenGL widget) 1.6 support.
 
-
-%package doc
-Summary:        Documentation files for %{name}
-Group:          Development/Languages
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation files for %{name}.
-
-
 %prep
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1 -z .shebang
-
+cp -p %{SOURCE1} .
 
 %build
 %{__python} setup.py build
@@ -68,6 +60,7 @@
 
 %files
 %defattr(-,root,root,-)
+%doc license.txt
 %{python_sitelib}/*OpenGL*
 %exclude %{python_sitelib}/OpenGL/Tk
 
@@ -75,9 +68,6 @@
 %defattr(-,root,root,-)
 %{python_sitelib}/OpenGL/Tk
 
-%files doc
-%defattr(-,root,root,-)
-
 %changelog
 * Fri Jan 2 2009 Nikolay Vladimirov <nikolay at vladimiroff.com> - 3.0.0-0.11.b8
 - New upstream 3.0.0b8 (b7 was skipped by upstream)
@@ -86,8 +76,9 @@
 - remove "--single-version-externally-managed" option for setup.py
 - *.egg-info is no longer a folder, it's a file now 
 - Tests are no longer installed by setup.py
-- Documentation is no longer distributed in "documentation" folder
-- license.txt is also no longer provided by upstream.
+- Obsolete 'doc' subpackage (no longer distributed "documentation" folder)
+- license.txt is also no longer provided by upstream. Using one from b6
+- Removed Requires for libGL and libGLU ( should be pulled for freeglut)
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.0-0.10.b6
 - Fix locations for Python 2.6




More information about the fedora-extras-commits mailing list