diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5ff901a..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wxPythonSrc-2.4.2.4.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6500b9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wxPython-src-2.6.3.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index d2485ab..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPython -# $Id$ -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/Rootx && { 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/sources b/sources index d49d5e3..464223d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea4eb68e10a0c2a9be643b35dcb78e41 wxPythonSrc-2.4.2.4.tar.gz +a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz diff --git a/wxPython.spec b/wxPython.spec index b834409..a4825b5 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -1,64 +1,151 @@ -%define pyver %(python -c 'import sys ; print sys.version[:3]') +%{!?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.4.2.4 -Release: 0.fdr.2.1 -Epoch: 0 -Summary: wxPython is a GUI toolkit for the Python programming language. +Version: 2.6.3.2 +Release: 2%{?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/wxPythonSrc-%{version}.tar.gz +Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK2-devel >= 0:2.4.2, pkgconfig -BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: python-devel, wxGTK2-gl -Requires: %{_libdir}/python%{pyver} +BuildRequires: wxGTK-devel = 2.6.3, 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} %description -wxPython is a GUI toolkit for the Python programming language. It allows +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 +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. + + %prep -%setup -q -n %{name}Src-%{version} +%setup -q -n wxPython-src-%{version} + %build -# just build the wxPython part, not all of wxWindows which we already have -# in fedora... +# 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 -# this doesn't get built automatically, resulting in bogus libwx_gtk2-2.3.so.0 -# dependency for the package -cd demo/dllwidget -make clean -make %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/docs wxPython/demo wxPython/licence/ wxPython/samples +%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{_libdir}/python%{pyver}/site-packages/wxPython -%{_libdir}/python%{pyver}/site-packages/wx +%{python_sitearch}/wx.pth +%{python_sitearch}/wxversion.py* +%dir %{python_sitearch}/wx-2.6-gtk2-unicode/ +%{python_sitearch}/wx-2.6-gtk2-unicode/wx +%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/wx-2.6/wx/wxPython +%{_includedir}/wx-2.6/wx/wxPython/*.h +%dir %{_includedir}/wx-2.6/wx/wxPython/i_files +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py* +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg + %changelog +* 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. +~