From a5ecf5ecd2d0f213da18e8a0cca5be8caac2cdef Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 24 Apr 2008 05:10:00 +0000 Subject: [PATCH] epel push --- sources | 2 +- wxPython.spec | 62 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/sources b/sources index 464223d..ddd1250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz +04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index a4825b5..ab16667 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.6.3.2 +Version: 2.8.7.1 Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -12,10 +12,11 @@ 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://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: wxGTK-devel = 2.6.3, pkgconfig +# make sure to keep this updated as appropriate +BuildRequires: wxGTK-devel >= 2.8.7 +BuildRequires: pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl @@ -24,6 +25,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 @@ -77,21 +81,53 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{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 +%dir %{python_sitearch}/wx-2.8-gtk2-unicode/ +%{python_sitearch}/wx-2.8-gtk2-unicode/wx +%{python_sitearch}/wx-2.8-gtk2-unicode/wxPython +%{python_sitelib}/wxaddons +%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 -%{_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 +%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 %changelog +* 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