Accepting request 515786 from home:TheBlackCat:branches:devel:languages:python

- Update to version 1.9.3
- Implement single-spec version
- Fix source URL
- Fix shebangs

OBS-URL: https://build.opensuse.org/request/show/515786
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygame?expand=0&rev=13

README.SUSE

@@ -1,6 +0,0 @@
-Python pygame
-=============
-
-More documentation for pygame can be found in package python-pygame-doc, if
-you want some more examples check package python-gamelets.
-

pygame-1.9.1release.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433
-size 2134254

pygame-1.9.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:751021819bdc0cbe5cbd51904abb6ff9e9aee5b0e8955af02284d0e77d6c9ec2
+size 2974541

pygame-v4l-2.6.38.patch

@@ -1,11 +0,0 @@
---- src/camera.h	2008-10-10 04:37:10.000000000 +0200
-+++ src/camera.h	2011-07-07 13:00:43.880088827 +0200
-@@ -39,7 +39,7 @@
- 
-     #include <asm/types.h>          /* for videodev2.h */
- 
--    #include <linux/videodev.h>
-+    #include <libv4l1-videodev.h>
-     #include <linux/videodev2.h>
- #endif
- 

python-pygame.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Aug  8 20:33:56 UTC 2017 - toddrme2178@gmail.com
+
+- Update to version 1.9.3
+  * This is a bugfix release which fixes a couple of key issues
+    which came up with 1.9.2
+- Update to version 1.9.2
+- Implement single-spec version
+- Fix source URL
+- Fix shebangs
+- Remove pygame-v4l-2.6.38.patch
+  No longer needed
+
 -------------------------------------------------------------------
 Sun Oct 12 09:49:51 UTC 2014 - mailaender@opensuse.org
 

python-pygame.rpmlintrc

@@ -1,2 +0,0 @@
-addFilter("/site-packages/pygame/examples/")
-addFilter("/site-packages/pygame/tests/")

python-pygame.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-pygame
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,60 +16,50 @@
 #
 
 
+# There are font issues in the test environment
+%bcond_with test
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pygame
-Version:        1.9.1
+Version:        1.9.3
 Release:        0
-Source:         http://pygame.org/ftp/pygame-%{version}release.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/P/Pygame/pygame-%{version}.tar.gz
-Source1:        README.SUSE
-Source2:        python-pygame.rpmlintrc
-# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch1:         pygame-v4l-2.6.38.patch
 Summary:        A Python Module for Interfacing with the SDL Multimedia Library
 License:        LGPL-2.1+
 Group:          Development/Libraries/Python
 Url:            http://www.pygame.org/
-Provides:       pygame = %{version}
+BuildRequires:  %{python_module devel}
-Obsoletes:      pygame < %{version}
+BuildRequires:  %{python_module numpy}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  %{python_module setuptools}
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  fdupes
+BuildRequires:  fontconfig
+BuildRequires:  freetype2-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
-BuildRequires:  python-devel
-BuildRequires:  xorg-x11
-%if 0%{?suse_version} > 1110
-BuildRequires:  python-numpy
-%else
-BuildRequires:  python-numeric
-%endif
-%if 0%{?suse_version} >= 1210
 BuildRequires:  libv4l-devel >= 0.8.4
-%endif
-%if 0%{?suse_version} >= 1320
 BuildRequires:  portmidi-devel
+BuildRequires:  python-rpm-macros
+BuildRequires:  xorg-x11
+Requires:       fontconfig
+Requires:       python-numpy
+%ifpython2
+Provides:       pygame = %{version}
+Obsoletes:      pygame < %{version}
 %endif
-%{py_requires}
+
+%python_subpackages
 
 %description
 Pygame is a Python wrapper module for the SDL multimedia library. It
 contains Python functions and classes that allow you to use SDL's
-support for playing CD-ROMs, audio and video output, and keyboard,
+support for playing CD-ROMs, audio and video output, and kz`eyboard,
 mouse and joystick input. Pygame also includes support for the
 Numerical Python extension. Pygame is the successor to the pySDL
 wrapper project, written by Mark Baker.
 
-%package doc
-Summary:        Pygame documentation and example programs
-Group:          Development/Libraries/Python
-Provides:       pygame-doc > 1.5.5
-Obsoletes:      pygame-doc <= 1.5.5
-Requires:       python-pygame = %{version}
-
-%description doc
-This package contains documentation and example programs for Pygame.
-
 %package devel
 Summary:        Pygame development package
 Group:          Development/Libraries/Python
@@ -78,41 +68,71 @@ Requires:       python-pygame = %{version}
 %description devel
 This package contains the header files for developers of Pygame.
 
+%package -n %{name}-doc
+Summary:        Pygame documentation and example programs
+Group:          Development/Libraries/Python
+Provides:       pygame-doc = %{version}
+Obsoletes:      pygame-doc < %{version}
+Provides:       %{python_module pygame-doc = %{version}}
+
+%description -n %{name}-doc
+This package contains documentation and example programs for Pygame.
+
 %prep
-%setup -q -n pygame-%{version}release
+%setup -q -n pygame-%{version}
-%if 0%{?suse_version} >= 1210
+sed -i 's/\r$//' docs/reST/ref/code_examples/draw_module_example.py
-%patch1
+sed -i 's/\r$//' docs/reST/ref/code_examples/joystick_calls.py
-%endif
+# Fix wrong-script-interpreter
+find examples -name '*.py' -exec sed -i "s|^#!/usr/bin/env python$|#!%{__python3}|" {} \;
+find examples -name '*.py' -exec sed -i "s|^#! /usr/bin/env python$|#!%{__python3}|" {} \;
+chmod a+x examples/*.py
+%fdupes docs
+%fdupes examples
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
-yes y | python -d config.py
+%python_build
-python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
-#install doc
+%{python_expand pushd %{buildroot}%{$python_sitearch}
-install -d %{buildroot}%{_docdir}/python-pygame
+sed -i "s|^#!/usr/bin/env python$|#!%{__python3}|" pygame/tests/test_utils/png.py
-install -m 644 WHATSNEW README.txt %{SOURCE1} %{buildroot}%{_docdir}/python-pygame
+chmod a+x pygame/tests/test_utils/png.py
-cp -r docs/ examples/ %{buildroot}%{_docdir}/python-pygame
+chmod a+x pygame/examples/macosx/aliens_app_example/aliens.py
+chmod a+x pygame/examples/*.py
+chmod a-x pygame/examples/__init__.py
+chmod a-x pygame/examples/prevent_display_stretching.py
+chmod a-x pygame/examples/freetype_misc.py
+$python -m compileall -d %{$python_sitearch} pygame/tests/test_utils/
+$python -O -m compileall -d %{$python_sitearch} pygame/tests/test_utils/
+%fdupes .
+popd
+}
 
-%fdupes -s %{buildroot}%{_prefix}
+%if %{with test}
+%check
+export SDL_VIDEODRIVER=dummy
+export SDL_AUDIODRIVER=disk
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
+$python -m pygame.tests.__main__ --exclude opengl --time_out 300
+}
+%endif
 
-%files
+%files %{python_files}
-%defattr(644,root,root,755)
+%defattr(-,root,root)
-%doc %dir %{_docdir}/python-pygame
+%doc LGPL WHATSNEW readme.html readme.rst
-%doc %{_docdir}/python-pygame/WHATSNEW
+%{python_sitearch}/pygame/
-%doc %{_docdir}/python-pygame/README.txt
+%{python_sitearch}/pygame-%{version}-py*.egg-info
-%doc %{_docdir}/python-pygame/README.SUSE
-%{python_sitearch}/*
 
-%files doc
+%files %{python_files devel}
-%defattr(644,root,root,755)
+%defattr(-,root,root)
-%doc %{_docdir}/python-pygame/docs
+%doc LGPL
-%doc %{_docdir}/python-pygame/examples
+%{python_sysconfig_var INCLUDEPY}/pygame/
 
-%files devel
+%files -n %{name}-doc
-%defattr(644,root,root,755)
+%defattr(-,root,root)
-%{py_incdir}/pygame/
+%doc LGPL
+%doc docs/
+%doc examples/
 
 %changelog