update to 2.8.12.0 (#699207)

- backport to wxGTK 2.8.10 API
- cleaned up BRs

.cvsignore

@@ -1 +0,0 @@
-wxPython-src-2.8.9.2.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+wxPython-src-2.8.11.0.tar.bz2
+/wxPython-src-2.8.12.0.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxPython
-# $Id: Makefile,v 1.2 2004/11/24 05:07:05 gafton Exp $
-NAME := wxPython
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-e3d89746af98b9279e4ff39a57f6dc63  wxPython-src-2.8.9.2.tar.bz2
+402e0b81e06f596d849e221a7a76acc6  wxPython-src-2.8.12.0.tar.bz2

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
+ 
+ #--------------------------------------------------------------------------#

wxPython-2.8.9.2-treelist.patch

@@ -1,11 +0,0 @@
---- 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 ;

wxPython.spec

@@ -1,35 +1,30 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.8.9.2
+Version:        2.8.12.0
-Release:        3%{?dist}
+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
+# fix aui imports
-Patch0:         wxPython-2.8.9.2-treelist.patch
+# http://trac.wxwidgets.org/ticket/12107
+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.9
+BuildRequires:  wxGTK-devel >= 2.8.11
-BuildRequires:  pkgconfig
+BuildRequires:  python-devel
-BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  libGL-devel, libGLU-devel
-BuildRequires:  python-devel, wxGTK-gl
 
 # 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
@@ -62,7 +57,7 @@ Documentation, samples and demo application for wxPython.
 
 %prep
 %setup -q -n wxPython-src-%{version}
-%patch0 -p1 -b .treelist
+%patch0 -p1 -b .aui
 
 # fix libdir otherwise additional wx libs cannot be found
 sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
@@ -101,7 +96,7 @@ 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
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
 %{python_sitelib}/*egg-info
 %{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
 %endif
@@ -121,6 +116,31 @@ 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)
+
+* Sun Jul 11 2010 Lubomir Rintel <lkundrak@v3.sk> - 2.8.11.0-2
+- Include egg-info when build on recent RHEL
+
+* 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)
+
+* Sat Jan 16 2010 Dan Horák <dan[at]danny.cz> - 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 <hdegoede@redhat.com> - 2.8.9.2-4
+- Change python_foo macros to use %%global as the new rpm will break
+  using %%define here, see:
+  https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild