diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..b89a8f8 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +wxPython-src-2.8.9.2.tar.bz2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..59b840a --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# 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) 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..3cd943c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +e3d89746af98b9279e4ff39a57f6dc63 wxPython-src-2.8.9.2.tar.bz2 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..4c1eeae --- /dev/null +++ b/wxPython.spec @@ -0,0 +1,250 @@ +%{!?python_sitelib: %define 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)")} + +%define buildflags WXPORT=gtk2 UNICODE=1 + +Name: wxPython +Version: 2.8.9.2 +Release: 2%{?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 +# http://trac.wxwidgets.org/ticket/10703 +Patch0: wxPython-2.8.9.2-treelist.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: pkgconfig +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 +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 + +# 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 +* 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. +~