diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a89b5e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wxPython-src-2.8.11.0.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index fb13297..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Python 2 only - replaced by python-wxpython4 diff --git a/sources b/sources new file mode 100644 index 0000000..08f0993 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2 diff --git a/wxPython-2.8.11.0-aui.patch b/wxPython-2.8.11.0-aui.patch new file mode 100644 index 0000000..45fab7c --- /dev/null +++ b/wxPython-2.8.11.0-aui.patch @@ -0,0 +1,24 @@ +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 diff --git a/wxPython-2.8.9.2-treelist.patch b/wxPython-2.8.9.2-treelist.patch new file mode 100644 index 0000000..e7cf28b --- /dev/null +++ b/wxPython-2.8.9.2-treelist.patch @@ -0,0 +1,11 @@ +--- 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 ; diff --git a/wxPython.spec b/wxPython.spec new file mode 100644 index 0000000..d8effbd --- /dev/null +++ b/wxPython.spec @@ -0,0 +1,270 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?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.11.0 +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://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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# make sure to keep this updated as appropriate +BuildRequires: wxGTK-devel >= 2.8.11 +BuildRequires: python-devel + +# packages should depend on "wxPython", not "wxPythonGTK2", but in case +# one does, here's the provides for it. +Provides: wxPythonGTK2 = %{version}-%{release} + +%description +wxPython is a GUI toolkit for the Python programming language. It allows +Python programmers to create programs with a robust, highly functional +graphical user interface, simply and easily. It is implemented as a Python +extension module (native code) that wraps the popular wxWindows cross +platform GUI library, which is written in C++. + +%package devel +Group: Development/Libraries +Summary: Development files for wxPython add-on modules +Requires: %{name} = %{version}-%{release} +Requires: wxGTK-devel + +%description devel +This package includes C++ header files and SWIG files needed for developing +add-on modules for wxPython. It is NOT needed for development of most +programs which use the wxPython toolkit. + +%package docs +Group: Documentation +Summary: Documentation and samples for wxPython +Requires: %{name} = %{version}-%{release} +%if 0%{?fedora} > 9 +BuildArch: noarch +%endif + +%description docs +Documentation, samples and demo application for wxPython. + + +%prep +%setup -q -n wxPython-src-%{version} +%patch0 -p1 -b .treelist +%patch1 -p1 -b .aui + +# fix libdir otherwise additional wx libs cannot be found +sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py + + +%build +# Just build the wxPython part, not all of wxWindows which we already have +# in Fedora +cd wxPython +# included distutils is not multilib aware; use normal +rm -rf distutils +python setup.py %{buildflags} build + + +%install +rm -rf $RPM_BUILD_ROOT +cd wxPython +python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT + +# this is a kludge.... +%if "%{python_sitelib}" != "%{python_sitearch}" +mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth $RPM_BUILD_ROOT%{python_sitearch} +mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch} +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc wxPython/licence +%{_bindir}/* +%{python_sitearch}/wx.pth +%{python_sitearch}/wxversion.py* +%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 +%{python_sitelib}/*egg-info +%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info +%endif + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/wx-2.8/wx/wxPython +%{_includedir}/wx-2.8/wx/wxPython/*.h +%dir %{_includedir}/wx-2.8/wx/wxPython/i_files +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.i +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.py* +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.swg + +%files docs +%defattr(-,root,root,-) +%doc wxPython/docs wxPython/demo wxPython/samples + + +%changelog +* Mon May 31 2010 Dan Horák - 2.8.11.0-1 +- update to 2.8.11.0 (#593837, #595936, #597639) + +* Sun May 2 2010 Dan Horák - 2.8.10.1-3 +- rebuilt with wxGTK 2.8.11 + +* Wed Mar 17 2010 Dan Horák - 2.8.10.1-2 +- add missing module (#573961) + +* Sat Jan 16 2010 Dan Horák - 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 - 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 - 2.8.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Apr 10 2009 Dan Horák - 2.8.9.2-2 +- add patch to fix compile failure for contrib/gizmos/_treelist.i + +* Fri Apr 10 2009 Dan Horák - 2.8.9.2-1 +- update to 2.8.9.2 +- create noarch docs subpackage + +* Thu Mar 5 2009 Lubomir Rintel - 2.8.9.1-4 +- Rebuilt for newer wxgtk package + +* Wed Feb 25 2009 Fedora Release Engineering - 2.8.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.8.9.1-2 +- Rebuild for Python 2.6 + +* Tue Sep 30 2008 Dan Horak - 2.8.9.1-1 +- update to 2.8.9.1 +- fix libdir for additional wx libraries (#306761) + +* Mon Sep 29 2008 Dan Horak - 2.8.9.0-1 +- update to 2.8.9.0 + +* Sat Sep 6 2008 Tom "spot" Callaway - 2.8.8.0-2 +- fix license tag + +* Thu Jul 31 2008 Matthew Miller - 2.8.8.0-1 +- update to 2.8.8.0 (bug #457408) +- a fix for bug #450073 is included in the upstream release, so + dropping that patch. + +* Thu Jun 12 2008 Hans de Goede - 2.8.7.1-5 +- Fix an attribute error when importing wxPython (compat) module + (redhat bugzilla 450073, 450074) + +* Sat Jun 6 2008 Matthew Miller - 2.8.7.1-4 +- gratuitously bump package release number to work around build system + glitch. again, but it will work this time. + +* Wed Jun 4 2008 Matthew Miller - 2.8.7.1-3 +- gratuitously bump package release number to work around build system + glitch + +* Thu Feb 21 2008 Matthew Miller - 2.8.7.1-2 +- include egg-info files for fedora 9 or greater + +* Wed Feb 20 2008 Matthew Miller - 2.8.7.1-1 +- update to 2.8.7.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 2.8.4.0-3 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Fedora Release Engineering - 2.8.4.0-2 +- Rebuild for selinux ppc32 issue. + +* Wed Jul 11 2007 Matthew Miller - 2.8.4.0-1 +- update to 2.8.4.0 +- obsolete compat-wxPythonGTK + +* Sun Apr 15 2007 Matthew Miller - 2.8.3.0-1 +- update to 2.8.3.0 + +* Fri Dec 15 2006 Matthew Miller - 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 - 2.6.3.2-3 +- bump release for rebuild against python 2.5. + +* Mon Aug 28 2006 Matthew Miller - 2.6.3.2-2 +- bump release for FC6 rebuild + +* Thu Apr 13 2006 Matthew Miller - 2.6.3.2-1 +- version 2.6.3.2 +- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :) +- upstream tarball no longer includes embedded.o (since I finally got around + to pointing that out to the developers instead of just kludging it away.) +- buildrequires to just libGLU-devel instead of mesa-libGL-devel + +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 +- grr. bump relnumber. + +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 +- oh yeah -- wxversion.py not lib64. + +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 +- buildrequires mesa-libGLU-devel + +* Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 +- update to 2.6.3.0 +- wxGTK and wxPython versions are inexorably linked; make BuildRequires + be exact, rather than >=. +- make devel subpackage as per comment #7 in bug #163440. + +* Thu Nov 24 2005 Matthew Miller - 2.6.1.0-1 +- update to 2.6.0.0 +- merge in changes from current extras 2.4.x package +- Happy Thanksgiving +- build animate extention again -- works now. + +* Thu Apr 28 2005 Matthew Miller - 2.6.0.0-bu45.1 +- get rid of accidental binaries in source tarball -- they generates + spurious dependencies and serve no purpose +- update to 2.6.0.0 and build for Velouria +- switch to Fedora Extras base spec file +- enable gtk2 and unicode and all the code stuff (as FE does) +- disable BUILD_ANIMATE extension from contrib -- doesn't build +- files are in a different location now -- adjust to that +- zap include files (needed only for building wxPython 3rd-party modules), + because I don't think this is likely to be very useful. Other option + would be to create a -devel package, but I think that'd be confusing. + +* Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 +- remove included disutils - it is not multilib aware; this + fixes build on x86_64 + +* Tue Jan 06 2004 Panu Matilainen 0:2.4.2.4-0.fdr.3 +- rename package to wxPythonGTK2, provide wxPython (see bug 927) +- dont ship binaries in /usr/share + +* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 +- add missing buildrequires: python-devel, wxGTK2-gl + +* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 +- Initial RPM release. +~