update to 2.8.12.0 (#699207)

#2781)

.cvsignore

@@ -1 +0,0 @@
-wxPython-src-2.6.3.2.tar.gz

.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 @@
-a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz
+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.spec

@@ -4,18 +4,22 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.6.3.2
+Version:        2.8.12.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.wxpython.org/
-Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/wxpython/%{name}-src-%{version}.tar.bz2
+# fix aui imports
+# 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.6.3, pkgconfig
+BuildRequires:  wxGTK-devel >= 2.8.11
+BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  libGL-devel, libGLU-devel
 BuildRequires:  python-devel, wxGTK-gl
@@ -24,6 +28,9 @@ BuildRequires:  python-devel, wxGTK-gl
 # 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
@@ -45,6 +52,10 @@ programs which use the wxPython toolkit.
 
 %prep
 %setup -q -n wxPython-src-%{version}
+%patch0 -p1 -b .aui
+
+# fix libdir otherwise additional wx libs cannot be found
+sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py
 
 
 %build
@@ -77,21 +88,58 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{python_sitearch}/wx.pth
 %{python_sitearch}/wxversion.py*
-%dir %{python_sitearch}/wx-2.6-gtk2-unicode/
+%dir %{python_sitearch}/wx-2.8-gtk2-unicode/
-%{python_sitearch}/wx-2.6-gtk2-unicode/wx
+%{python_sitearch}/wx-2.8-gtk2-unicode/wx
-%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
+%{python_sitearch}/wx-2.8-gtk2-unicode/wxPython
+%if 0%{?fedora} >= 9
+%{python_sitelib}/*egg-info
+%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info
+%endif
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/wx-2.6/wx/wxPython
+%dir %{_includedir}/wx-2.8/wx/wxPython
-%{_includedir}/wx-2.6/wx/wxPython/*.h
+%{_includedir}/wx-2.8/wx/wxPython/*.h
-%dir %{_includedir}/wx-2.6/wx/wxPython/i_files
+%dir %{_includedir}/wx-2.8/wx/wxPython/i_files
-%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i
+%{_includedir}/wx-2.8/wx/wxPython/i_files/*.i
-%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py*
+%{_includedir}/wx-2.8/wx/wxPython/i_files/*.py*
-%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg
+%{_includedir}/wx-2.8/wx/wxPython/i_files/*.swg
 
 
 %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)
+
+* Thu Feb 21 2008 Matthew Miller <mattdm@mattdm.org> - 2.8.7.1-2
+- include egg-info files for fedora 9 or greater
+
+* Wed Feb 20 2008 Matthew Miller <mattdm@mattdm.org> - 2.8.7.1-1
+- update to 2.8.7.1
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.8.4.0-3
+- Autorebuild for GCC 4.3
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.8.4.0-2
+- Rebuild for selinux ppc32 issue.
+
+* Wed Jul 11 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.4.0-1
+- update to 2.8.4.0
+- obsolete compat-wxPythonGTK
+
+* Sun Apr 15 2007 Matthew Miller <mattdm@mattdm.org> - 2.8.3.0-1
+- update to 2.8.3.0
+
+* Fri Dec 15 2006 Matthew Miller <mattdm@mattdm.org> - 2.8.0.1-1
+- update to 2.8.0.1
+- make buildrequire wxGTK of version-wxpythonsubrelease
+- add wxaddons to filelist
+
+* Mon Dec 11 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3.2-3
+- bump release for rebuild against python 2.5.
+
 * Mon Aug 28 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3.2-2
 - bump release for FC6 rebuild