rpms/wxPython/devel wxPython-2.8.11.0-aui.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.14, 1.15 wxPython.spec, 1.39, 1.40 wxPython-2.8.10.1-ebmlib.patch, 1.1, NONE
Dan Horák
sharkcz at fedoraproject.org
Mon May 31 08:44:10 UTC 2010
Author: sharkcz
Update of /cvs/pkgs/rpms/wxPython/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3503
Modified Files:
.cvsignore sources wxPython.spec
Added Files:
wxPython-2.8.11.0-aui.patch
Removed Files:
wxPython-2.8.10.1-ebmlib.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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 16 Jan 2010 13:52:10 -0000 1.16
+++ .cvsignore 31 May 2010 08:44:09 -0000 1.17
@@ -1 +1 @@
-wxPython-src-2.8.10.1.tar.bz2
+wxPython-src-2.8.11.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 16 Jan 2010 13:52:10 -0000 1.14
+++ sources 31 May 2010 08:44:09 -0000 1.15
@@ -1 +1 @@
-65d5ef166f23fe8b4c67f58df164f93e wxPython-src-2.8.10.1.tar.bz2
+63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2
Index: wxPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- wxPython.spec 3 May 2010 08:49:52 -0000 1.39
+++ wxPython.spec 31 May 2010 08:44:10 -0000 1.40
@@ -4,8 +4,8 @@
%define buildflags WXPORT=gtk2 UNICODE=1
Name: wxPython
-Version: 2.8.10.1
-Release: 3%{?dist}
+Version: 2.8.11.0
+Release: 1%{?dist}
Summary: GUI toolkit for the Python programming language
@@ -15,11 +15,12 @@ URL: http://www.wxpython.org/
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
-# add missing module - https://bugzilla.redhat.com/show_bug.cgi?id=573961
-Patch2: wxPython-2.8.10.1-ebmlib.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.10
+BuildRequires: wxGTK-devel >= 2.8.11
BuildRequires: python-devel
# packages should depend on "wxPython", not "wxPythonGTK2", but in case
@@ -59,7 +60,7 @@ Documentation, samples and demo applicat
%prep
%setup -q -n wxPython-src-%{version}
%patch0 -p1 -b .treelist
-%patch2 -p1 -b .ebmlib
+%patch1 -p1 -b .aui
# fix libdir otherwise additional wx libs cannot be found
sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
@@ -118,6 +119,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)
+
* Sun May 2 2010 Dan Horák <dan[at]danny.cz> - 2.8.10.1-3
- rebuilt with wxGTK 2.8.11
--- wxPython-2.8.10.1-ebmlib.patch DELETED ---
More information about the scm-commits
mailing list