rpms/wxPython/EL-6 import.log, NONE, 1.1 wxPython-2.8.11.0-aui.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.14, 1.15 wxPython.spec, 1.37, 1.38 wxPython-2.8.10-backport.patch, 1.1, NONE wxPython-2.8.10.1-ebmlib.patch, 1.1, NONE

Lubomir Rintel lkundrak at fedoraproject.org
Sun Jul 11 20:36:49 UTC 2010


Author: lkundrak

Update of /cvs/pkgs/rpms/wxPython/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15788/EL-6

Modified Files:
	.cvsignore sources wxPython.spec 
Added Files:
	import.log wxPython-2.8.11.0-aui.patch 
Removed Files:
	wxPython-2.8.10-backport.patch wxPython-2.8.10.1-ebmlib.patch 
Log Message:
Pull from devel



--- NEW FILE import.log ---
wxPython-2_8_11_0-1_fc14:EL-6:wxPython-2.8.11.0-1.fc14.src.rpm:1278880487

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/EL-6/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	16 Jan 2010 17:03:23 -0000	1.16
+++ .cvsignore	11 Jul 2010 20:36:49 -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/EL-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	16 Jan 2010 17:03:23 -0000	1.14
+++ sources	11 Jul 2010 20:36:49 -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/EL-6/wxPython.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- wxPython.spec	17 Mar 2010 11:12:17 -0000	1.37
+++ wxPython.spec	11 Jul 2010 20:36:49 -0000	1.38
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.10.1
-Release:        2%{?dist}
+Version:        2.8.11.0
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -15,13 +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
-# backport to wxGTK 2.8.10 API
-Patch1:         wxPython-2.8.10-backport.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
@@ -61,8 +60,7 @@ Documentation, samples and demo applicat
 %prep
 %setup -q -n wxPython-src-%{version}
 %patch0 -p1 -b .treelist
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .aui
 
 # fix libdir otherwise additional wx libs cannot be found
 sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
@@ -121,6 +119,12 @@ 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
+
 * Wed Mar 17 2010 Dan Horák <dan[at]danny.cz> - 2.8.10.1-2
 - add missing module (#573961)
 


--- wxPython-2.8.10-backport.patch DELETED ---


--- wxPython-2.8.10.1-ebmlib.patch DELETED ---



More information about the scm-commits mailing list