rpms/wxPython/EL-5 wxPython-2.8.11.0-aui.patch, NONE, 1.1 wxPython-2.8.9.2-treelist.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 wxPython.spec, 1.13, 1.14
Dan Horák
sharkcz at fedoraproject.org
Mon May 31 09:28:49 UTC 2010
Author: sharkcz
Update of /cvs/pkgs/rpms/wxPython/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9059
Modified Files:
.cvsignore sources wxPython.spec
Added Files:
wxPython-2.8.11.0-aui.patch wxPython-2.8.9.2-treelist.patch
Log Message:
* Mon May 31 2010 Dan Horák <dan[at]danny.cz> - 2.8.11.0-1
- update to 2.8.11.0 (#593837, #595936, #597639)
wxPython-2.8.11.0-aui.patch:
ed_pages.py | 2 +-
ed_shelf.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE wxPython-2.8.11.0-aui.patch ---
diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py
--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2010-05-27 15:38:42.000000000 +0200
+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py 2010-05-27 15:38:50.000000000 +0200
@@ -36,7 +36,7 @@ import ed_txt
import ed_mdlg
import ebmlib
import eclib
-from extern import aui
+from wx.lib.agw import aui
#--------------------------------------------------------------------------#
# Globals
diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py
--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2010-05-27 15:38:20.000000000 +0200
+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2010-05-27 15:38:28.000000000 +0200
@@ -28,7 +28,7 @@ import ed_glob
from profiler import Profile_Get
import plugin
import iface
-import extern.aui as aui
+from wx.lib.agw import aui
#--------------------------------------------------------------------------#
# Globals
wxPython-2.8.9.2-treelist.patch:
gizmos_wrap.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE wxPython-2.8.9.2-treelist.patch ---
--- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig 2009-04-10 23:03:18.000000000 +0200
+++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2009-04-10 23:03:41.000000000 +0200
@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_
PyObject *resultobj = 0;
wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ;
wxTreeItemId *arg2 = 0 ;
- wxTreeItemId const &arg3_defvalue = NULL ;
+ wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ;
wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ;
bool arg4 = (bool) true ;
void *argp1 = 0 ;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/EL-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 13 Apr 2006 21:09:03 -0000 1.5
+++ .cvsignore 31 May 2010 09:28:48 -0000 1.6
@@ -1 +1 @@
-wxPython-src-2.6.3.2.tar.gz
+wxPython-src-2.8.11.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/EL-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 24 Apr 2008 05:10:00 -0000 1.6
+++ sources 31 May 2010 09:28:49 -0000 1.7
@@ -1 +1 @@
-04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2
+63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2
Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/EL-5/wxPython.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- wxPython.spec 24 Apr 2008 05:10:00 -0000 1.13
+++ wxPython.spec 31 May 2010 09:28:49 -0000 1.14
@@ -4,8 +4,8 @@
%define buildflags WXPORT=gtk2 UNICODE=1
Name: wxPython
-Version: 2.8.7.1
-Release: 2%{?dist}
+Version: 2.8.11.0
+Release: 1%{?dist}
Summary: GUI toolkit for the Python programming language
@@ -13,9 +13,14 @@ Group: Development/Languages
License: LGPL
URL: http://www.wxpython.org/
Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2
+# http://trac.wxwidgets.org/ticket/10703
+Patch0: wxPython-2.8.9.2-treelist.patch
+# fix aui imports
+# http://trac.wxwidgets.org/ticket/12107
+Patch1: wxPython-2.8.11.0-aui.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# make sure to keep this updated as appropriate
-BuildRequires: wxGTK-devel >= 2.8.7
+BuildRequires: wxGTK-devel >= 2.8.11
BuildRequires: pkgconfig
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: libGL-devel, libGLU-devel
@@ -49,6 +54,11 @@ programs which use the wxPython toolkit.
%prep
%setup -q -n wxPython-src-%{version}
+%patch0 -p1 -b .treelist
+%patch1 -p1 -b .aui
+
+# fix libdir otherwise additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
%build
@@ -84,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{python_sitearch}/wx-2.8-gtk2-unicode/
%{python_sitearch}/wx-2.8-gtk2-unicode/wx
%{python_sitearch}/wx-2.8-gtk2-unicode/wxPython
-%{python_sitelib}/wxaddons
%if 0%{?fedora} >= 9
%{python_sitelib}/*egg-info
%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
@@ -101,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon May 31 2010 Dan Horák <dan[at]danny.cz> - 2.8.11.0-1
+- update to 2.8.11.0 (#593837, #595936, #597639)
+
* Thu Feb 21 2008 Matthew Miller <mattdm at mattdm.org> - 2.8.7.1-2
- include egg-info files for fedora 9 or greater
More information about the scm-commits
mailing list