From 9daf47389b864c3604851bb2e8926e97d5ce3ca3 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Jan 16 2010 13:52:10 +0000 Subject: - update to 2.8.10.1 - backport to wxGTK 2.8.10 API - cleaned up BRs --- diff --git a/.cvsignore b/.cvsignore index b89a8f8..5017d43 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.8.9.2.tar.bz2 +wxPython-src-2.8.10.1.tar.bz2 diff --git a/sources b/sources index 3cd943c..53956ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3d89746af98b9279e4ff39a57f6dc63 wxPython-src-2.8.9.2.tar.bz2 +65d5ef166f23fe8b4c67f58df164f93e wxPython-src-2.8.10.1.tar.bz2 diff --git a/wxPython-2.8.10-backport.patch b/wxPython-2.8.10-backport.patch new file mode 100644 index 0000000..0639913 --- /dev/null +++ b/wxPython-2.8.10-backport.patch @@ -0,0 +1,390 @@ +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core.py wxPython-src-2.8.10.1/wxPython/src/gtk/_core.py +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core.py 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/_core.py 2010-01-16 10:52:45.000000000 +0100 +@@ -6034,10 +6034,6 @@ class ShowEvent(Event): + """GetShow(self) -> bool""" + return _core_.ShowEvent_GetShow(*args, **kwargs) + +- def IsShown(*args, **kwargs): +- """IsShown(self) -> bool""" +- return _core_.ShowEvent_IsShown(*args, **kwargs) +- + Show = property(GetShow,SetShow,doc="See `GetShow` and `SetShow`") + _core_.ShowEvent_swigregister(ShowEvent) + +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/_core_wrap.cpp +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_core_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/_core_wrap.cpp 2010-01-16 10:53:50.000000000 +0100 +@@ -28673,36 +28673,6 @@ fail: + } + + +-SWIGINTERN PyObject *_wrap_ShowEvent_IsShown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +- PyObject *resultobj = 0; +- wxShowEvent *arg1 = (wxShowEvent *) 0 ; +- bool result; +- void *argp1 = 0 ; +- int res1 = 0 ; +- PyObject *swig_obj[1] ; +- +- if (!args) SWIG_fail; +- swig_obj[0] = args; +- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxShowEvent, 0 | 0 ); +- if (!SWIG_IsOK(res1)) { +- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShowEvent_IsShown" "', expected argument " "1"" of type '" "wxShowEvent const *""'"); +- } +- arg1 = reinterpret_cast< wxShowEvent * >(argp1); +- { +- PyThreadState* __tstate = wxPyBeginAllowThreads(); +- result = (bool)((wxShowEvent const *)arg1)->IsShown(); +- wxPyEndAllowThreads(__tstate); +- if (PyErr_Occurred()) SWIG_fail; +- } +- { +- resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); +- } +- return resultobj; +-fail: +- return NULL; +-} +- +- + SWIGINTERN PyObject *ShowEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; +@@ -61296,7 +61266,6 @@ static PyMethodDef SwigMethods[] = { + { (char *)"new_ShowEvent", (PyCFunction) _wrap_new_ShowEvent, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ShowEvent_SetShow", (PyCFunction) _wrap_ShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"ShowEvent_GetShow", (PyCFunction)_wrap_ShowEvent_GetShow, METH_O, NULL}, +- { (char *)"ShowEvent_IsShown", (PyCFunction)_wrap_ShowEvent_IsShown, METH_O, NULL}, + { (char *)"ShowEvent_swigregister", ShowEvent_swigregister, METH_VARARGS, NULL}, + { (char *)"ShowEvent_swiginit", ShowEvent_swiginit, METH_VARARGS, NULL}, + { (char *)"new_IconizeEvent", (PyCFunction) _wrap_new_IconizeEvent, METH_VARARGS | METH_KEYWORDS, NULL}, +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi.py wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi.py +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi.py 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi.py 2010-01-16 10:54:38.000000000 +0100 +@@ -3538,10 +3538,6 @@ class DC(_core.Object): + """ + return _gdi_.DC_SetClippingRect(*args, **kwargs) + +- def SetDeviceClippingRegion(*args, **kwargs): +- """SetDeviceClippingRegion(self, Region region)""" +- return _gdi_.DC_SetDeviceClippingRegion(*args, **kwargs) +- + def DrawLines(*args, **kwargs): + """ + DrawLines(self, List points, int xoffset=0, int yoffset=0) +@@ -5962,11 +5958,6 @@ class GraphicsRenderer(_core.Object): + return _gdi_.GraphicsRenderer_GetDefaultRenderer(*args, **kwargs) + + GetDefaultRenderer = staticmethod(GetDefaultRenderer) +- def GetCairoRenderer(*args, **kwargs): +- """GetCairoRenderer() -> GraphicsRenderer""" +- return _gdi_.GraphicsRenderer_GetCairoRenderer(*args, **kwargs) +- +- GetCairoRenderer = staticmethod(GetCairoRenderer) + def CreateContext(*args): + """ + CreateContext(self, WindowDC dc) -> GraphicsContext +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi_wrap.cpp +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/_gdi_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/_gdi_wrap.cpp 2010-01-16 11:00:47.000000000 +0100 +@@ -4171,12 +4171,6 @@ public : + "wx.GraphicsRenderer is not available on this platform."); + return NULL; + } +- static wxGraphicsRenderer* GetCairoRenderer() { +- PyErr_SetString(PyExc_NotImplementedError, +- "wx.GraphicsRenderer is not available on this platform."); +- return NULL; +- } +- + virtual wxGraphicsContext * CreateContext( const wxWindowDC& ) { return NULL; } + virtual wxGraphicsContext * CreateContextFromNativeContext( void * ) { return NULL; } + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * ) { return NULL; } +@@ -20579,47 +20573,6 @@ fail: + } + + +-SWIGINTERN PyObject *_wrap_DC_SetDeviceClippingRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +- PyObject *resultobj = 0; +- wxDC *arg1 = (wxDC *) 0 ; +- wxRegion *arg2 = 0 ; +- void *argp1 = 0 ; +- int res1 = 0 ; +- void *argp2 = 0 ; +- int res2 = 0 ; +- PyObject * obj0 = 0 ; +- PyObject * obj1 = 0 ; +- char * kwnames[] = { +- (char *) "self",(char *) "region", NULL +- }; +- +- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:DC_SetDeviceClippingRegion",kwnames,&obj0,&obj1)) SWIG_fail; +- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); +- if (!SWIG_IsOK(res1)) { +- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "1"" of type '" "wxDC *""'"); +- } +- arg1 = reinterpret_cast< wxDC * >(argp1); +- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion, 0 | 0); +- if (!SWIG_IsOK(res2)) { +- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); +- } +- if (!argp2) { +- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DC_SetDeviceClippingRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); +- } +- arg2 = reinterpret_cast< wxRegion * >(argp2); +- { +- PyThreadState* __tstate = wxPyBeginAllowThreads(); +- (arg1)->SetDeviceClippingRegion((wxRegion const &)*arg2); +- wxPyEndAllowThreads(__tstate); +- if (PyErr_Occurred()) SWIG_fail; +- } +- resultobj = SWIG_Py_Void(); +- return resultobj; +-fail: +- return NULL; +-} +- +- + SWIGINTERN PyObject *_wrap_DC_DrawLines(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; +@@ -30753,22 +30706,6 @@ fail: + } + + +-SWIGINTERN PyObject *_wrap_GraphicsRenderer_GetCairoRenderer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +- PyObject *resultobj = 0; +- wxGraphicsRenderer *result = 0 ; +- +- if (!SWIG_Python_UnpackTuple(args,"GraphicsRenderer_GetCairoRenderer",0,0,0)) SWIG_fail; +- { +- result = (wxGraphicsRenderer *)wxGraphicsRenderer::GetCairoRenderer(); +- if (PyErr_Occurred()) SWIG_fail; +- } +- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsRenderer, 0 | 0 ); +- return resultobj; +-fail: +- return NULL; +-} +- +- + SWIGINTERN PyObject *_wrap_GraphicsRenderer_CreateContext__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxGraphicsRenderer *arg1 = (wxGraphicsRenderer *) 0 ; +@@ -40069,7 +40006,6 @@ static PyMethodDef SwigMethods[] = { + { (char *)"DC_SetClippingRegionPointSize", (PyCFunction) _wrap_DC_SetClippingRegionPointSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS, NULL}, +- { (char *)"DC_SetDeviceClippingRegion", (PyCFunction) _wrap_DC_SetDeviceClippingRegion, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_DrawLines", (PyCFunction) _wrap_DC_DrawLines, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_DrawPolygon", (PyCFunction) _wrap_DC_DrawPolygon, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"DC_DrawLabel", (PyCFunction) _wrap_DC_DrawLabel, METH_VARARGS | METH_KEYWORDS, NULL}, +@@ -40341,7 +40277,6 @@ static PyMethodDef SwigMethods[] = { + { (char *)"GraphicsContext_swigregister", GraphicsContext_swigregister, METH_VARARGS, NULL}, + { (char *)"delete_GraphicsRenderer", (PyCFunction)_wrap_delete_GraphicsRenderer, METH_O, NULL}, + { (char *)"GraphicsRenderer_GetDefaultRenderer", (PyCFunction)_wrap_GraphicsRenderer_GetDefaultRenderer, METH_NOARGS, NULL}, +- { (char *)"GraphicsRenderer_GetCairoRenderer", (PyCFunction)_wrap_GraphicsRenderer_GetCairoRenderer, METH_NOARGS, NULL}, + { (char *)"GraphicsRenderer_CreateContext", _wrap_GraphicsRenderer_CreateContext, METH_VARARGS, NULL}, + { (char *)"GraphicsRenderer_CreateMeasuringContext", (PyCFunction)_wrap_GraphicsRenderer_CreateMeasuringContext, METH_O, NULL}, + { (char *)"GraphicsRenderer_CreateContextFromNativeContext", (PyCFunction) _wrap_GraphicsRenderer_CreateContextFromNativeContext, METH_VARARGS | METH_KEYWORDS, NULL}, +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc.py wxPython-src-2.8.10.1/wxPython/src/gtk/xrc.py +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc.py 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/xrc.py 2010-01-16 11:02:40.000000000 +0100 +@@ -441,18 +441,6 @@ class XmlNode(object): + """SetProperties(self, XmlProperty prop)""" + return _xrc.XmlNode_SetProperties(*args, **kwargs) + +- def GetAttribute(*args, **kwargs): +- """GetAttribute(self, String attrName, String defaultVal) -> String""" +- return _xrc.XmlNode_GetAttribute(*args, **kwargs) +- +- def AddAttribute(*args, **kwargs): +- """AddAttribute(self, String attrName, String value)""" +- return _xrc.XmlNode_AddAttribute(*args, **kwargs) +- +- def GetAttributes(*args, **kwargs): +- """GetAttributes(self) -> XmlProperty""" +- return _xrc.XmlNode_GetAttributes(*args, **kwargs) +- + Children = property(GetChildren,SetChildren,doc="See `GetChildren` and `SetChildren`") + Content = property(GetContent,SetContent,doc="See `GetContent` and `SetContent`") + Name = property(GetName,SetName,doc="See `GetName` and `SetName`") +diff -Nrup wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc_wrap.cpp wxPython-src-2.8.10.1/wxPython/src/gtk/xrc_wrap.cpp +--- wxPython-src-2.8.10.1.orig/wxPython/src/gtk/xrc_wrap.cpp 2009-05-12 23:24:20.000000000 +0200 ++++ wxPython-src-2.8.10.1/wxPython/src/gtk/xrc_wrap.cpp 2010-01-16 11:03:14.000000000 +0100 +@@ -6361,163 +6361,6 @@ fail: + } + + +-SWIGINTERN PyObject *_wrap_XmlNode_GetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +- PyObject *resultobj = 0; +- wxXmlNode *arg1 = (wxXmlNode *) 0 ; +- wxString *arg2 = 0 ; +- wxString *arg3 = 0 ; +- wxString result; +- void *argp1 = 0 ; +- int res1 = 0 ; +- bool temp2 = false ; +- bool temp3 = false ; +- PyObject * obj0 = 0 ; +- PyObject * obj1 = 0 ; +- PyObject * obj2 = 0 ; +- char * kwnames[] = { +- (char *) "self",(char *) "attrName",(char *) "defaultVal", NULL +- }; +- +- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:XmlNode_GetAttribute",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; +- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); +- if (!SWIG_IsOK(res1)) { +- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetAttribute" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); +- } +- arg1 = reinterpret_cast< wxXmlNode * >(argp1); +- { +- arg2 = wxString_in_helper(obj1); +- if (arg2 == NULL) SWIG_fail; +- temp2 = true; +- } +- { +- arg3 = wxString_in_helper(obj2); +- if (arg3 == NULL) SWIG_fail; +- temp3 = true; +- } +- { +- PyThreadState* __tstate = wxPyBeginAllowThreads(); +- result = ((wxXmlNode const *)arg1)->GetAttribute((wxString const &)*arg2,(wxString const &)*arg3); +- wxPyEndAllowThreads(__tstate); +- if (PyErr_Occurred()) SWIG_fail; +- } +- { +-#if wxUSE_UNICODE +- resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len()); +-#else +- resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len()); +-#endif +- } +- { +- if (temp2) +- delete arg2; +- } +- { +- if (temp3) +- delete arg3; +- } +- return resultobj; +-fail: +- { +- if (temp2) +- delete arg2; +- } +- { +- if (temp3) +- delete arg3; +- } +- return NULL; +-} +- +- +-SWIGINTERN PyObject *_wrap_XmlNode_AddAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +- PyObject *resultobj = 0; +- wxXmlNode *arg1 = (wxXmlNode *) 0 ; +- wxString *arg2 = 0 ; +- wxString *arg3 = 0 ; +- void *argp1 = 0 ; +- int res1 = 0 ; +- bool temp2 = false ; +- bool temp3 = false ; +- PyObject * obj0 = 0 ; +- PyObject * obj1 = 0 ; +- PyObject * obj2 = 0 ; +- char * kwnames[] = { +- (char *) "self",(char *) "attrName",(char *) "value", NULL +- }; +- +- if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:XmlNode_AddAttribute",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; +- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); +- if (!SWIG_IsOK(res1)) { +- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_AddAttribute" "', expected argument " "1"" of type '" "wxXmlNode *""'"); +- } +- arg1 = reinterpret_cast< wxXmlNode * >(argp1); +- { +- arg2 = wxString_in_helper(obj1); +- if (arg2 == NULL) SWIG_fail; +- temp2 = true; +- } +- { +- arg3 = wxString_in_helper(obj2); +- if (arg3 == NULL) SWIG_fail; +- temp3 = true; +- } +- { +- PyThreadState* __tstate = wxPyBeginAllowThreads(); +- (arg1)->AddAttribute((wxString const &)*arg2,(wxString const &)*arg3); +- wxPyEndAllowThreads(__tstate); +- if (PyErr_Occurred()) SWIG_fail; +- } +- resultobj = SWIG_Py_Void(); +- { +- if (temp2) +- delete arg2; +- } +- { +- if (temp3) +- delete arg3; +- } +- return resultobj; +-fail: +- { +- if (temp2) +- delete arg2; +- } +- { +- if (temp3) +- delete arg3; +- } +- return NULL; +-} +- +- +-SWIGINTERN PyObject *_wrap_XmlNode_GetAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +- PyObject *resultobj = 0; +- wxXmlNode *arg1 = (wxXmlNode *) 0 ; +- wxXmlProperty *result = 0 ; +- void *argp1 = 0 ; +- int res1 = 0 ; +- PyObject *swig_obj[1] ; +- +- if (!args) SWIG_fail; +- swig_obj[0] = args; +- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlNode, 0 | 0 ); +- if (!SWIG_IsOK(res1)) { +- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlNode_GetAttributes" "', expected argument " "1"" of type '" "wxXmlNode const *""'"); +- } +- arg1 = reinterpret_cast< wxXmlNode * >(argp1); +- { +- PyThreadState* __tstate = wxPyBeginAllowThreads(); +- result = (wxXmlProperty *)((wxXmlNode const *)arg1)->GetAttributes(); +- wxPyEndAllowThreads(__tstate); +- if (PyErr_Occurred()) SWIG_fail; +- } +- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlProperty, 0 | 0 ); +- return resultobj; +-fail: +- return NULL; +-} +- +- + SWIGINTERN PyObject *XmlNode_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; +@@ -9050,9 +8893,6 @@ static PyMethodDef SwigMethods[] = { + { (char *)"XmlNode_SetNext", (PyCFunction) _wrap_XmlNode_SetNext, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlNode_SetChildren", (PyCFunction) _wrap_XmlNode_SetChildren, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlNode_SetProperties", (PyCFunction) _wrap_XmlNode_SetProperties, METH_VARARGS | METH_KEYWORDS, NULL}, +- { (char *)"XmlNode_GetAttribute", (PyCFunction) _wrap_XmlNode_GetAttribute, METH_VARARGS | METH_KEYWORDS, NULL}, +- { (char *)"XmlNode_AddAttribute", (PyCFunction) _wrap_XmlNode_AddAttribute, METH_VARARGS | METH_KEYWORDS, NULL}, +- { (char *)"XmlNode_GetAttributes", (PyCFunction)_wrap_XmlNode_GetAttributes, METH_O, NULL}, + { (char *)"XmlNode_swigregister", XmlNode_swigregister, METH_VARARGS, NULL}, + { (char *)"XmlNode_swiginit", XmlNode_swiginit, METH_VARARGS, NULL}, + { (char *)"new_XmlDocument", (PyCFunction) _wrap_new_XmlDocument, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython.spec b/wxPython.spec index 6caa0b1..0dc4acb 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,32 +4,28 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.9.2 -Release: 4%{?dist} +Version: 2.8.10.1 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPLv2+ and wxWidgets URL: http://www.wxpython.org/ -Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/wxpython/%{name}-src-%{version}.tar.bz2 # http://trac.wxwidgets.org/ticket/10703 Patch0: wxPython-2.8.9.2-treelist.patch +# backport to wxGTK 2.8.10 API +Patch1: wxPython-2.8.10-backport.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate -BuildRequires: wxGTK-devel >= 2.8.9 -BuildRequires: pkgconfig -BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: libGL-devel, libGLU-devel -BuildRequires: python-devel, wxGTK-gl +BuildRequires: wxGTK-devel >= 2.8.10 +BuildRequires: python-devel # packages should depend on "wxPython", not "wxPythonGTK2", but in case # one does, here's the provides for it. Provides: wxPythonGTK2 = %{version}-%{release} -# time for this to go away. -Obsoletes: compat-wxPythonGTK < 2.8.4.0 - %description wxPython is a GUI toolkit for the Python programming language. It allows Python programmers to create programs with a robust, highly functional @@ -63,6 +59,7 @@ Documentation, samples and demo application for wxPython. %prep %setup -q -n wxPython-src-%{version} %patch0 -p1 -b .treelist +%patch1 -p1 # fix libdir otherwise additional wx libs cannot be found sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py @@ -121,6 +118,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 16 2010 Dan Horák - 2.8.10.1-1 +- update to 2.8.10.1 +- backport to wxGTK 2.8.10 API +- cleaned up BRs + * Thu Jan 7 2010 Hans de Goede - 2.8.9.2-4 - Change python_foo macros to use %%global as the new rpm will break using %%define here, see: