diff --git a/.cvsignore b/.cvsignore index 6a45dad..1a779bd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -wxPython-src-2.8.7.1.tar.bz2 -clog +wxPython-src-2.8.9.1.tar.bz2 diff --git a/sources b/sources index ddd1250..aecf294 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 +4ad9a64e05529097618c7e48fbb10a84 wxPython-src-2.8.9.1.tar.bz2 diff --git a/wxPython-src-2.8.7.1-bug450073.patch b/wxPython-src-2.8.7.1-bug450073.patch deleted file mode 100644 index 8375d0a..0000000 --- a/wxPython-src-2.8.7.1-bug450073.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py~ wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py ---- wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py~ 2008-06-12 23:45:44.000000000 +0200 -+++ wxPython-src-2.8.7.1/wxPython/wxPython/_misc.py 2008-06-12 23:45:44.000000000 +0200 -@@ -453,7 +453,7 @@ wxDateTime_ConvertYearToBC = wx._misc.Da - wxDateTime_GetCurrentMonth = wx._misc.DateTime_GetCurrentMonth - wxDateTime_IsLeapYear = wx._misc.DateTime_IsLeapYear - wxDateTime_GetCentury = wx._misc.DateTime_GetCentury --wxDateTime_GetNumberOfDaysinYear = wx._misc.DateTime_GetNumberOfDaysinYear -+wxDateTime_GetNumberOfDaysInYear = wx._misc.DateTime_GetNumberOfDaysInYear - wxDateTime_GetNumberOfDaysInMonth = wx._misc.DateTime_GetNumberOfDaysInMonth - wxDateTime_GetMonthName = wx._misc.DateTime_GetMonthName - wxDateTime_GetWeekDayName = wx._misc.DateTime_GetWeekDayName diff --git a/wxPython.spec b/wxPython.spec index 67bb56b..8330ca3 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,19 +4,18 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.7.1 -Release: 5%{?dist} +Version: 2.8.9.1 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language Group: Development/Languages -License: LGPL +License: LGPLv2+ and wxWidgets URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 -Patch0: wxPython-src-2.8.7.1-bug450073.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate -BuildRequires: wxGTK-devel >= 2.8.7 +BuildRequires: wxGTK-devel >= 2.8.9 BuildRequires: pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel @@ -50,7 +49,9 @@ programs which use the wxPython toolkit. %prep %setup -q -n wxPython-src-%{version} -%patch0 -p1 + +# fix libdir otherwise it additional wx libs cannot be found +sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py %build @@ -103,6 +104,21 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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)