[arch-commits] Commit in python-opengl/repos (3 files)

[Eric Bélanger]

    Date: Wednesday, March 25, 2009 @ 16:58:42
  Author: eric
Revision: 31343

Merged revisions 31082,31342 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/python-opengl/trunk

........
  r31082 | douglas | 2009-03-24 05:34:39 -0400 (Tue, 24 Mar 2009) | 1 line
  
  upgpkg: python-opengl 3.0.0c1-1
........
  r31342 | eric | 2009-03-25 16:58:18 -0400 (Wed, 25 Mar 2009) | 2 lines
  
  upgpkg: python-opengl 3.0.0c1-2
      Fixing license
........

Added:
  python-opengl/repos/extra-x86_64/LICENSE
    (from rev 31342, python-opengl/trunk/LICENSE)
Modified:
  python-opengl/repos/extra-x86_64/	(properties)
  python-opengl/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   30 ++++++++++++++++++++++++++++++
 PKGBUILD |   17 ++++++-----------
 2 files changed, 36 insertions(+), 11 deletions(-)


Property changes on: python-opengl/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /python-opengl/trunk:1-11905
   + /python-opengl/trunk:1-31342

Copied: python-opengl/repos/extra-x86_64/LICENSE (from rev 31342, python-opengl/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-03-25 20:58:42 UTC (rev 31343)
@@ -0,0 +1,30 @@
+# 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.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-25 20:58:18 UTC (rev 31342)
+++ extra-x86_64/PKGBUILD	2009-03-25 20:58:42 UTC (rev 31343)
@@ -4,25 +4,20 @@
 # Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=python-opengl
-pkgver=3.0.0b5
-pkgrel=1
+pkgver=3.0.0c1
+pkgrel=2
 pkgdesc="The cross platform Python binding to OpenGL and related APIs"
 arch=(i686 x86_64)
-license=('CUSTOM')
+license=('BSD')
 depends=('python' 'tk' 'freeglut' 'setuptools')
 provides=('pyopengl' 'python-pyopengl')
 conflicts=('pyopengl' 'python-pyopengl')
 url="http://pyopengl.sourceforge.net"
+source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-$pkgver.tar.gz LICENSE)
+md5sums=('51a33cea33f3e8eb2eaf12f574dcb1af' '0b53c508a63e5dbaf44cdfb0fa103b3a')
 
-source=(http://downloads.sourceforge.net/pyopengl/PyOpenGL-$pkgver.tar.gz)
-
-md5sums=('4e46b6ce318b82799109a4850dd37c50')
-
 build() {
     cd $startdir/src/PyOpenGL-$pkgver
     python setup.py install --root=$startdir/pkg
-
-    # Install the LICENSE
-    install -D -m644 $startdir/src/PyOpenGL-$pkgver/license.txt  \
-                     $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+    install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }