diff --git a/.gitignore b/.gitignore index 946eeb5..d278bd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pyglet-1.2alpha1-repacked.tar.gz /pyglet-1.2.0-repacked.tar.gz /pyglet-1.2.1-repacked.tar.gz +/pyglet-1.2.4-repacked.tar.gz diff --git a/python-pyglet.spec b/python-pyglet.spec index cb0eaa4..08dd49b 100644 --- a/python-pyglet.spec +++ b/python-pyglet.spec @@ -1,12 +1,12 @@ %global with_python3 1 %global srcname pyglet -%global srcversion 1.2.1 +%global srcversion 1.2.4 %global versionedname %{srcname}-%{srcversion} Name: python-%{srcname} Version: %{srcversion} -Release: 4%{?dist} +Release: 1%{?dist} Summary: A cross-platform windowing and multimedia library for Python License: BSD @@ -28,19 +28,31 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %endif -Requires: python -%if 0%{?fedora} <= 18 -Requires: python-imaging%{?_isa} -%else +%description +This library provides an object-oriented programming interface for developing +games and other visually-rich applications with Python. +pyglet has virtually no external dependencies. For most applications and game +requirements, pyglet needs nothing else besides Python, simplifying +distribution and installation. It also handles multiple windows and +fully aware of multi-monitor setups. + +pyglet might be seen as an alternative to PyGame. + + +%package -n python2-%{srcname} +Summary: A cross-platform windowing and multimedia library for Python 3 + +%{?python_provide:%python_provide python2-%{srcname}} + +Requires: python2 Requires: python-pillow%{?_isa} -%endif # The libraries are imported dynamically using ctypes, so rpm can't find them. Requires: libGL +Requires: libGLU Requires: libX11 - -%description +%description -n python2-%{srcname} This library provides an object-oriented programming interface for developing games and other visually-rich applications with Python. pyglet has virtually no external dependencies. For most applications and game @@ -50,15 +62,19 @@ fully aware of multi-monitor setups. pyglet might be seen as an alternative to PyGame. + %if 0%{?with_python3} %package -n python3-%{srcname} Summary: A cross-platform windowing and multimedia library for Python 3 +%{?python_provide:%python_provide python3-%{srcname}} + Requires: python3 Requires: python3-pillow%{?_isa} # The libraries are imported dynamically using ctypes, so rpm can't find them. Requires: libGL +Requires: libGLU Requires: libX11 %description -n python3-%{srcname} @@ -92,26 +108,26 @@ cp -a . %{py3dir} %build -%{__python} setup.py build +%py2_build %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py build +%py3_build popd %endif + %install -%{__python} setup.py install --skip-build --root %{buildroot} -%py_byte_compile %{__python} %{buildroot}%{python_sitelib}/%{srcname} +%py2_install %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/%{srcname} +%py3_install popd %endif -%files + +%files -n python2-%{srcname} %license LICENSE %doc CHANGELOG %doc README @@ -133,6 +149,10 @@ popd %changelog +* Tue Aug 09 2016 Petr Viktorin - 1.2.4-1 +- Update to upstream 1.2.4 +- Specfile cleanup + * Tue Jul 19 2016 Fedora Release Engineering - 1.2.1-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 95a4407..142fd94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e63c533a61070fedad6643eaa8da5070 pyglet-1.2.1-repacked.tar.gz +c3d4c6d5c75479ecb1a45f165f5335e2 pyglet-1.2.4-repacked.tar.gz