From c5fe240ebf2df567c57454a917c157d5ae4c9651 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 26 Jan 2018 17:26:00 +0100 Subject: [PATCH] Update to upstream 1.3.0 --- .gitignore | 1 + pyglet-get-tarball.sh | 2 +- python-pyglet.spec | 20 +++++++++++++------- sources | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d278bd5..0e7bb09 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pyglet-1.2.0-repacked.tar.gz /pyglet-1.2.1-repacked.tar.gz /pyglet-1.2.4-repacked.tar.gz +/pyglet-1.3.0-repacked.tar.gz diff --git a/pyglet-get-tarball.sh b/pyglet-get-tarball.sh index 4b2f38d..de413fd 100644 --- a/pyglet-get-tarball.sh +++ b/pyglet-get-tarball.sh @@ -2,7 +2,7 @@ VERSIONEDNAME=$1 -wget -N https://pypi.python.org/packages/source/p/pyglet/${VERSIONEDNAME}.tar.gz +wget -N https://files.pythonhosted.org/packages/source/p/pyglet/${VERSIONEDNAME}.tar.gz tar xzvf ${VERSIONEDNAME}.tar.gz pushd ${VERSIONEDNAME} rm -rvf examples # includes non-free artwork diff --git a/python-pyglet.spec b/python-pyglet.spec index 82ffb9f..67ba2c2 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -1,12 +1,12 @@ %global with_python3 1 %global srcname pyglet -%global srcversion 1.2.4 +%global srcversion 1.3.0 %global versionedname %{srcname}-%{srcversion} Name: python-%{srcname} Version: %{srcversion} -Release: 5%{?dist} +Release: 1%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD @@ -15,7 +15,7 @@ URL: http://www.pyglet.org/ # The upstream tarball includes some non-free files in the examples and tests, # and a patented texture compression algorithm. # Run the following (in rpmbuild/SOURCES) to generate the distributed tarball: -# $ bash pyglet-get-tarball.sh pyglet-1.2.1 +# $ bash pyglet-get-tarball.sh pyglet-1.3.0 # See the script for details. Source0: %{versionedname}-repacked.tar.gz Source1: pyglet-get-tarball.sh @@ -46,6 +46,7 @@ Summary: A cross-platform windowing and multimedia library for Python 3 Requires: python2 Requires: python2-pillow%{?_isa} +Requires: python2-future # The libraries are imported dynamically using ctypes, so rpm can't find them. Requires: libGL @@ -71,6 +72,7 @@ Summary: A cross-platform windowing and multimedia library for Python 3 Requires: python3 Requires: python3-pillow%{?_isa} +Requires: python3-future # The libraries are imported dynamically using ctypes, so rpm can't find them. Requires: libGL @@ -97,6 +99,9 @@ pyglet might be seen as an alternative to PyGame. rm pyglet/image/codecs/png.py rm pyglet/extlibs/png.py +# The future library can be unbundled (upstream even does it for the wheel distribution) +rm -r pyglet/extlibs/future + # Get rid of hashbang lines. This is a library, it has no executable scripts. # Also remove Windows newlines find . -name '*.py' | xargs sed --in-place -e's|#!/usr/bin/\(env \)\?python||;s/\r//' @@ -129,17 +134,15 @@ popd %files -n python2-%{srcname} %license LICENSE -%doc CHANGELOG %doc README %doc NOTICE %doc PKG-INFO -%{python_sitelib}/%{versionedname}-py2.7.egg-info -%{python_sitelib}/%{srcname} +%{python2_sitelib}/%{versionedname}-py2.7.egg-info +%{python2_sitelib}/%{srcname} %if 0%{?with_python3} %files -n python3-%{srcname} %license LICENSE -%doc CHANGELOG %doc README %doc NOTICE %doc PKG-INFO @@ -149,6 +152,9 @@ popd %changelog +* Fri Jan 26 2018 Petr Viktorin - 1.3.0-1 +- Update to upstream 1.3.0 + * Thu Aug 10 2017 Iryna Shcherbina - 1.2.4-5 - Use versioned python prefix for python-setuptools diff --git a/sources b/sources index 142fd94..15408da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3d4c6d5c75479ecb1a45f165f5335e2 pyglet-1.2.4-repacked.tar.gz +SHA512 (pyglet-1.3.0-repacked.tar.gz) = 1dace35024441b74057ab0707702dd9b66177c8ca2cb823f6751beacefe4fcc78a327f017b03350095f3a88de3e0652eea273644e7c54f27698320a6e83d744a