From 26cc9de4ef37f5755c81e51b9c0de8a0a0ced5520d1b758a92341c41df38a6bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 20 May 2019 09:10:25 +0000
Subject: [PATCH] Accepting request 704173 from home:pgajdos

- version update to 1.9.6
  * mixer thread deadlock issue when controlling it from different
    threads.
  * pygame.version.vernum now has major, minor, and patch attributes.
- added patches
  Do not test mp3 format.
  + python-pygame-test-no-mp3.patch

OBS-URL: https://build.opensuse.org/request/show/704173
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pygame?expand=0&rev=23
---
 pygame-1.9.4.tar.gz             |  3 ---
 pygame-1.9.6.tar.gz             |  3 +++
 python-pygame-test-no-mp3.patch | 13 +++++++++++++
 python-pygame.changes           | 11 +++++++++++
 python-pygame.spec              | 15 +++++++++------
 5 files changed, 36 insertions(+), 9 deletions(-)
 delete mode 100644 pygame-1.9.4.tar.gz
 create mode 100644 pygame-1.9.6.tar.gz
 create mode 100644 python-pygame-test-no-mp3.patch

diff --git a/pygame-1.9.4.tar.gz b/pygame-1.9.4.tar.gz
deleted file mode 100644
index 2de5834..0000000
--- a/pygame-1.9.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6
-size 4806863
diff --git a/pygame-1.9.6.tar.gz b/pygame-1.9.6.tar.gz
new file mode 100644
index 0000000..a3eed85
--- /dev/null
+++ b/pygame-1.9.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
+size 3223131
diff --git a/python-pygame-test-no-mp3.patch b/python-pygame-test-no-mp3.patch
new file mode 100644
index 0000000..b528e09
--- /dev/null
+++ b/python-pygame-test-no-mp3.patch
@@ -0,0 +1,13 @@
+Index: pygame-1.9.6/test/mixer_music_test.py
+===================================================================
+--- pygame-1.9.6.orig/test/mixer_music_test.py	2019-04-25 08:14:48.000000000 +0200
++++ pygame-1.9.6/test/mixer_music_test.py	2019-05-20 10:36:59.969907416 +0200
+@@ -33,7 +33,7 @@ class MixerMusicModuleTest(unittest.Test
+           # Load a music file for playback
+ 
+         data_fname = example_path('data')
+-        formats = ['mp3', 'ogg', 'wav']
++        formats = ['ogg', 'wav']
+ 
+         for f in formats:
+             path = os.path.join(data_fname, 'house_lo.%s' % f)
diff --git a/python-pygame.changes b/python-pygame.changes
index 86987b2..2fd6be2 100644
--- a/python-pygame.changes
+++ b/python-pygame.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May 20 08:46:49 UTC 2019 - pgajdos@suse.com
+
+- version update to 1.9.6
+  * mixer thread deadlock issue when controlling it from different
+    threads.
+  * pygame.version.vernum now has major, minor, and patch attributes.
+- added patches
+  Do not test mp3 format.
+  + python-pygame-test-no-mp3.patch
+
 -------------------------------------------------------------------
 Mon Sep  3 14:42:31 UTC 2018 - Matěj Cepl <mcepl@suse.com>
 
diff --git a/python-pygame.spec b/python-pygame.spec
index 0149a0c..a1aae77 100644
--- a/python-pygame.spec
+++ b/python-pygame.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pygame
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,19 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pygame
-Version:        1.9.4
+Version:        1.9.6
 Release:        0
 Summary:        A Python Module for Interfacing with the SDL Multimedia Library
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/Python
 URL:            https://github.com/pygame/pygame
 Source0:        https://files.pythonhosted.org/packages/source/p/pygame/pygame-%{version}.tar.gz
+# Do not test mp3 format.
+Patch0:         python-pygame-test-no-mp3.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module numpy}
 BuildRequires:  %{python_module setuptools}
@@ -87,6 +89,7 @@ This package contains documentation and example programs for Pygame.
 
 %prep
 %setup -q -n pygame-%{version}
+%patch0 -p1
 sed -i 's/\r$//' docs/reST/ref/code_examples/draw_module_example.py
 sed -i 's/\r$//' docs/reST/ref/code_examples/joystick_calls.py
 # Fix wrong-script-interpreter
@@ -126,13 +129,13 @@ $python -m pygame.tests.__main__ --exclude opengl --time_out 300
 }
 
 %files %{python_files}
-%doc WHATSNEW readme.html README.rst
-%license LGPL
+%doc README.rst
+%license docs/LGPL
 %{python_sitearch}/pygame/
 %{python_sitearch}/pygame-%{version}-py*.egg-info
 
 %files %{python_files devel}
-%license LGPL
+%license docs/LGPL
 %{python_sysconfig_var INCLUDEPY}/pygame/
 
 %files -n %{name}-doc