From cd352741884421f70304043fb70158c085ce5f97de32d766793c937f9bb6faf1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 7 Aug 2009 21:44:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-pygame?expand=0&rev=8 --- pygame-1.8.1release.tar.bz2 | 3 - pygame-1.9.0-readme.html.patch | 22 +++ pygame-1.9.0release.tar.bz2 | 3 + python-pygame-1.8.0-pep353.diff | 253 -------------------------------- python-pygame.changes | 9 ++ python-pygame.spec | 72 +-------- 6 files changed, 39 insertions(+), 323 deletions(-) delete mode 100644 pygame-1.8.1release.tar.bz2 create mode 100644 pygame-1.9.0-readme.html.patch create mode 100644 pygame-1.9.0release.tar.bz2 delete mode 100644 python-pygame-1.8.0-pep353.diff diff --git a/pygame-1.8.1release.tar.bz2 b/pygame-1.8.1release.tar.bz2 deleted file mode 100644 index 83407f1..0000000 --- a/pygame-1.8.1release.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da8e5ddfc3f4b8f5624115798b2c263df87b76a617c0baa5730ee368b3155b79 -size 1523643 diff --git a/pygame-1.9.0-readme.html.patch b/pygame-1.9.0-readme.html.patch new file mode 100644 index 0000000..282a806 --- /dev/null +++ b/pygame-1.9.0-readme.html.patch @@ -0,0 +1,22 @@ +--- bundle_docs.py ++++ bundle_docs.py +@@ -44,7 +44,7 @@ + try: + root = os.path.abspath('.') + alias = 'pygame' +- add_files(bundle, root, alias, ['LGPL', 'readme.html', 'install.html']) ++ add_files(bundle, root, alias, ['LGPL', 'install.html']) + add_directory(bundle, os.path.join(root, 'docs'), os.path.join(alias, 'docs')) + add_directory(bundle, os.path.join(root, 'examples'), os.path.join(alias, 'examples')) + print "\nFinished", bundle_name +--- setup.py ++++ setup.py +@@ -174,7 +174,7 @@ + + #add files in distribution directory + pygame_data_files.append('LGPL') +-pygame_data_files.append('readme.html') ++#pygame_data_files.append('readme.html') + pygame_data_files.append('install.html') + + #add non .py files in lib directory diff --git a/pygame-1.9.0release.tar.bz2 b/pygame-1.9.0release.tar.bz2 new file mode 100644 index 0000000..f7650e6 --- /dev/null +++ b/pygame-1.9.0release.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49c3078c7dfeefb1188d4f8c39f975a4fe9f4f90662b09e0444fbff4ffd69720 +size 1921931 diff --git a/python-pygame-1.8.0-pep353.diff b/python-pygame-1.8.0-pep353.diff deleted file mode 100644 index 3166113..0000000 --- a/python-pygame-1.8.0-pep353.diff +++ /dev/null @@ -1,253 +0,0 @@ ---- src/base.c -+++ src/base.c -@@ -117,7 +117,7 @@ - init (PyObject* self) - { - PyObject *allmodules, *moduleslist, *dict, *func, *result, *mod; -- int loop, num; -+ Py_ssize_t loop, num; - int success=0, fail=0; - - if (!CheckSDLVersions ()) -@@ -175,7 +175,7 @@ - { - PyObject* quit; - PyObject* privatefuncs; -- int num; -+ Py_ssize_t num; - - if (!quitfunctions) - return; -@@ -345,7 +345,7 @@ - static int - RGBAFromObj (PyObject* obj, Uint8* RGBA) - { -- int length; -+ Py_ssize_t length; - Uint32 val; - if (PyTuple_Check (obj) && PyTuple_Size (obj) == 1) - return RGBAFromObj (PyTuple_GET_ITEM (obj, 0), RGBA); ---- src/display.c -+++ src/display.c -@@ -685,7 +685,7 @@ - { - PyObject* seq; - PyObject* r; -- int loop, num, count; -+ Py_ssize_t loop, num, count; - SDL_Rect* rects; - if (PyTuple_Size (arg) != 1) - return RAISE -@@ -750,7 +750,7 @@ - SDL_Palette* pal; - SDL_Color* colors; - PyObject* list, *item = NULL; -- int i, len; -+ Py_ssize_t i, len; - int r, g, b; - - VIDEO_INIT_CHECK (); -@@ -774,7 +774,7 @@ - if (!PySequence_Check (list)) - return RAISE (PyExc_ValueError, "Argument must be a sequence type"); - -- len = MIN (pal->ncolors, PySequence_Length (list)); -+ len = MIN ((Py_ssize_t)pal->ncolors, PySequence_Length (list)); - - colors = (SDL_Color*)malloc (len * sizeof (SDL_Color)); - if (!colors) ---- src/draw.c -+++ src/draw.c -@@ -196,7 +196,8 @@ - Uint8 rgba[4]; - Uint32 color; - int closed, blend; -- int result, loop, length, drawn; -+ int result; -+ Py_ssize_t loop, length, drawn; - float startx, starty; - - /*get all the arguments*/ -@@ -285,7 +286,8 @@ - Uint8 rgba[4]; - Uint32 color; - int closed; -- int result, loop, length, drawn; -+ int result; -+ Py_ssize_t loop, length, drawn; - int startx, starty; - - /*get all the arguments*/ -@@ -536,7 +538,8 @@ - SDL_Surface* surf; - Uint8 rgba[4]; - Uint32 color; -- int width=0, length, loop, numpoints; -+ int width=0; -+ Py_ssize_t length, loop, numpoints; - int *xlist, *ylist; - int x, y, top, left, bottom, right, result; - ---- src/event.c -+++ src/event.c -@@ -428,7 +428,7 @@ - (unaryfunc)NULL, /*negative*/ - (unaryfunc)NULL, /*pos*/ - (unaryfunc)NULL, /*abs*/ -- (inquiry)event_nonzero, /*nonzero*/ -+ (lenfunc)event_nonzero, /*nonzero*/ - (unaryfunc)NULL, /*invert*/ - (binaryfunc)NULL, /*lshift*/ - (binaryfunc)NULL, /*rshift*/ -@@ -614,7 +614,7 @@ - { - SDL_Event event; - int mask = 0; -- int loop, num; -+ Py_ssize_t loop, num; - PyObject* type; - int val; - -@@ -660,7 +660,7 @@ - { - SDL_Event event; - int mask = 0; -- int loop, num; -+ Py_ssize_t loop, num; - PyObject* type, *list, *e; - int val; - -@@ -720,7 +720,7 @@ - SDL_Event event; - int result; - int mask = 0; -- int loop, num, noargs=0; -+ Py_ssize_t loop, num, noargs=0; - PyObject* type; - int val; - -@@ -793,7 +793,7 @@ - static PyObject* - set_allowed (PyObject* self, PyObject* args) - { -- int loop, num; -+ Py_ssize_t loop, num; - PyObject* type; - int val; - -@@ -833,7 +833,7 @@ - static PyObject* - set_blocked (PyObject* self, PyObject* args) - { -- int loop, num; -+ Py_ssize_t loop, num; - PyObject* type; - int val; - -@@ -873,7 +873,7 @@ - static PyObject* - get_blocked (PyObject* self, PyObject* args) - { -- int loop, num; -+ Py_ssize_t loop, num; - PyObject* type; - int val; - int isblocked = 0; ---- src/mouse.c -+++ src/mouse.c -@@ -108,7 +108,7 @@ - int w, h, spotx, spoty; - PyObject *xormask, *andmask; - Uint8 *xordata=NULL, *anddata=NULL; -- int xorsize, andsize, loop; -+ Py_ssize_t xorsize, andsize, loop; - int val; - SDL_Cursor *lastcursor, *cursor = NULL; - ---- src/rect.c -+++ src/rect.c -@@ -284,7 +284,7 @@ - { - PyRectObject* self = (PyRectObject*)oself; - GAME_Rect *argrect, temp; -- int loop, size; -+ Py_ssize_t loop, size; - PyObject* list, *obj; - int t, l, b, r; - -@@ -326,7 +326,7 @@ - { - PyRectObject* self = (PyRectObject*)oself; - GAME_Rect *argrect, temp; -- int loop, size; -+ Py_ssize_t loop, size; - PyObject* list, *obj; - int t, l, b, r; - -@@ -401,7 +401,7 @@ - { - PyRectObject* self = (PyRectObject*)oself; - GAME_Rect *argrect, temp; -- int loop, size; -+ Py_ssize_t loop, size; - PyObject* list, *obj; - PyObject* ret = NULL; - -@@ -442,7 +442,7 @@ - { - PyRectObject* self = (PyRectObject*)oself; - GAME_Rect *argrect, temp; -- int loop, size; -+ Py_ssize_t loop, size; - PyObject* list, *obj; - PyObject* ret = NULL; - -@@ -807,7 +807,8 @@ - PyRectObject *self = (PyRectObject *) _self; - PyObject *list; - int* data = (int*)&self->r; -- int numitems, loop, l = 4; -+ Py_ssize_t numitems, loop; -+ int l = 4; - - if (ihigh < 0) - ihigh += l; -@@ -840,7 +841,8 @@ - { - PyRectObject *self = (PyRectObject *) _self; - int* data = (int*)&self->r; -- int numitems, loop, l = 4; -+ Py_ssize_t numitems, loop; -+ int l = 4; - int val; - - if (!PySequence_Check (v)) -@@ -948,7 +950,7 @@ - (unaryfunc)NULL, /*negative*/ - (unaryfunc)NULL, /*pos*/ - (unaryfunc)NULL, /*abs*/ -- (inquiry)rect_nonzero, /*nonzero*/ -+ (lenfunc)rect_nonzero, /*nonzero*/ - (unaryfunc)NULL, /*invert*/ - (binaryfunc)NULL, /*lshift*/ - (binaryfunc)NULL, /*rshift*/ ---- src/surface.c -+++ src/surface.c -@@ -753,7 +753,7 @@ - SDL_Palette *pal = surf->format->palette; - SDL_Color *colors; - PyObject *list, *item; -- int i, len; -+ Py_ssize_t i, len; - int r, g, b; - - if (!PyArg_ParseTuple (args, "O", &list)) -@@ -770,7 +770,7 @@ - return RAISE (PyExc_SDLError, - "cannot set palette without pygame.display initialized"); - -- len = MIN (pal->ncolors, PySequence_Length (list)); -+ len = MIN ((Py_ssize_t)pal->ncolors, PySequence_Length (list)); - - colors = (SDL_Color *) malloc (len * sizeof (SDL_Color)); - if (!colors) diff --git a/python-pygame.changes b/python-pygame.changes index ae30471..b8936d6 100644 --- a/python-pygame.changes +++ b/python-pygame.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 5 20:09:35 CEST 2009 - matejcik@suse.cz + +- update to 1.9.0 + * many bugfixes + * full python-post-2.5 compatibility, py3k compatibility +- patched setup to workaround broken source tarball (missing readme.html) +- removed py2.5 compatibility patch + ------------------------------------------------------------------- Mon May 4 12:04:09 CEST 2009 - ro@suse.de diff --git a/python-pygame.spec b/python-pygame.spec index 9107eae..dd8bd0f 100644 --- a/python-pygame.spec +++ b/python-pygame.spec @@ -1,5 +1,5 @@ # -# spec file for package python-pygame (Version 1.8.1) +# spec file for package python-pygame (Version 1.9.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,11 +25,11 @@ BuildRequires: python-numpy %else BuildRequires: python-numeric %endif -Version: 1.8.1 -Release: 5 +Version: 1.9.0 +Release: 1 Source: pygame-%{version}release.tar.bz2 Source1: README.SuSE -Patch0: %{name}-1.8.0-pep353.diff +Patch1: pygame-1.9.0-readme.html.patch Summary: A Python Module for Interfacing with the SDL Multimedia Library License: LGPL v2.1 or later Group: Development/Libraries/Python @@ -78,7 +78,7 @@ Authors: %prep %setup -q -n pygame-%{version}release -%patch0 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing" @@ -108,65 +108,3 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/python-pygame/examples %changelog -* Mon May 04 2009 ro@suse.de -- buildrequires: replace python-numeric by python-numpy - for >= 11.2 -* Fri Mar 20 2009 matejcik@suse.cz -- (re)added libpng-devel and libjpeg-devel for image format support -* Fri Sep 12 2008 matejcik@suse.cz -- update to 1.8.1 - * lots of changes and fixes - see WHATSNEW for details -* Mon Jun 02 2008 crrodriguez@suse.de -- needs fno-strict-aliasing -* Thu Apr 03 2008 prusnak@suse.cz -- updated to 1.8.0 - * lots of changes and fixes - see WHATSNEW for details -- rewrite pep353.diff -* Tue Aug 21 2007 meissner@suse.de -- buildrequire SDL_ttf -> SDL_ttf-devel -* Tue Nov 21 2006 prusnak@suse.cz -- changes according to PEP353 (pep353.diff) -* Tue Feb 28 2006 jmatejek@suse.cz -- updated to reflect python changes due to #149809 -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Thu Oct 06 2005 matejcik@suse.cz -- update to 1.7.1release -- removed readme.html, which is no longer provided -* Wed Feb 02 2005 ro@suse.de -- fix build -* Tue Sep 21 2004 mcihar@suse.cz -- update to 1.6.2, this (among others) fixes brokeness on x86_64 - bug #45731 -* Fri Jan 30 2004 mcihar@suse.cz -- fixed documentation installation -* Fri Oct 24 2003 mcihar@suse.cz -- update to 1.6 (This new release mainly contains stability and internal - fixes, small fixes for line and circle primitives, many fixes for locating - system TrueType fonts, an updated Mac OS X environment, and bigger integer - storage for Rect objects.) -- patch was included in upstream -- no root for build -* Thu Oct 02 2003 mcihar@suse.cz -- fixed mode related functions that failed on AMD64, thanks to gpayer@suse.de (bug #31709) -* Mon Jun 16 2003 mcihar@suse.cz -- use record-rpm -- updated to 1.5.6 -* Mon May 12 2003 mcihar@suse.cz -- use versioned dependency on python -* Wed Jan 08 2003 mcihar@suse.cz -- added obsoletes and provides for rename -- moved doc into %%{_defaultdocdir}/python-pygame -- some doc is in base package with info where to find more -* Mon Jan 06 2003 mcihar@suse.cz -- update to 1.5.5 - * improved Unicode support - * fixed some bugs -- renamed to python-pygame -* Mon Aug 12 2002 ro@suse.de -- update to 1.5 to get rid of conflict with pause() from unistd -* Mon Feb 18 2002 vinil@suse.cz -- pygame now requires python -* Mon Feb 04 2002 nadvornik@suse.cz -- update to 1.4 -* Tue Jan 29 2002 nadvornik@suse.cz -- new package, version 1.3