[wxPython/f13/master] update to 2.8.12.0 (#699207)

[Dan Horák]

commit 64a7f1fc8bb64711b46df8dd42d391ca1226e9bf
Author: Dan Horák <dan at danny.cz>
Date:   Sun May 1 09:45:43 2011 +0200

    update to 2.8.12.0 (#699207)

 .gitignore                      |    1 +
 sources                         |    2 +-
 wxPython-2.8.11.0-aui.patch     |   24 ------------------------
 wxPython-2.8.12.0-aui.patch     |   24 ++++++++++++++++++++++++
 wxPython-2.8.9.2-treelist.patch |   11 -----------
 wxPython.spec                   |   12 ++++++------
 6 files changed, 32 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a89b5e..ea61b77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 wxPython-src-2.8.11.0.tar.bz2
+/wxPython-src-2.8.12.0.tar.bz2
diff --git a/sources b/sources
index 08f0993..f117e2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63f73aae49e530852db56a31b57529fa  wxPython-src-2.8.11.0.tar.bz2
+402e0b81e06f596d849e221a7a76acc6  wxPython-src-2.8.12.0.tar.bz2
diff --git a/wxPython-2.8.12.0-aui.patch b/wxPython-2.8.12.0-aui.patch
new file mode 100644
index 0000000..bd631e0
--- /dev/null
+++ b/wxPython-2.8.12.0-aui.patch
@@ -0,0 +1,24 @@
+diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py
+--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui	2011-04-13 22:28:07.000000000 +0200
++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py	2011-04-26 08:40:13.000000000 +0200
+@@ -37,7 +37,7 @@ import ed_txt
+ import ed_mdlg
+ import ebmlib
+ import eclib
+-from extern import aui
++from wx.lib.agw import aui
+ import ed_book
+ 
+ #--------------------------------------------------------------------------#
+diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py
+--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui	2011-04-13 22:28:07.000000000 +0200
++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py	2011-04-26 08:40:26.000000000 +0200
+@@ -29,7 +29,7 @@ from profiler import Profile_Get
+ import ed_msg
+ import plugin
+ import iface
+-from extern import aui
++from wx.lib.agw import aui
+ import ed_book
+ 
+ #--------------------------------------------------------------------------#
diff --git a/wxPython.spec b/wxPython.spec
index d8effbd..4c6c0e4 100644
--- a/wxPython.spec
+++ b/wxPython.spec
@@ -4,7 +4,7 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.11.0
+Version:        2.8.12.0
 Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
@@ -13,11 +13,9 @@ Group:          Development/Languages
 License:        LGPLv2+ and wxWidgets 
 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
 # fix aui imports
 # http://trac.wxwidgets.org/ticket/12107
-Patch1:         wxPython-2.8.11.0-aui.patch
+Patch0:         wxPython-2.8.12.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.11
@@ -59,8 +57,7 @@ Documentation, samples and demo application for wxPython.
 
 %prep
 %setup -q -n wxPython-src-%{version}
-%patch0 -p1 -b .treelist
-%patch1 -p1 -b .aui
+%patch0 -p1 -b .aui
 
 # fix libdir otherwise additional wx libs cannot be found
 sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
@@ -119,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 26 2011 Dan Horák <dan[at]danny.cz> - 2.8.12.0-1
+- update to 2.8.12.0 (#699207)
+
 * 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)