From 33a282fdf71398458efdbd35eed7725ceefd511a Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Feb 20 2008 21:39:03 +0000 Subject: clog --- diff --git a/.cvsignore b/.cvsignore index 5729026..dec6629 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxGTK-2.8.4.tar.bz2 +wxGTK-2.8.7.tar.bz2 diff --git a/sources b/sources index d6af62c..2fefdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22e42c1601d9759530c875ffa2c3c554 wxGTK-2.8.4.tar.bz2 +b25e85eeee524903214ebb520753f4bd wxGTK-2.8.7.tar.bz2 diff --git a/wxGTK-2.8.4-bad-g_free.patch b/wxGTK-2.8.4-bad-g_free.patch deleted file mode 100644 index fbc0836..0000000 --- a/wxGTK-2.8.4-bad-g_free.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- wxWidgets/trunk/src/gtk/button.cpp 2007/04/23 15:16:06 45602 -+++ wxWidgets/trunk/src/gtk/button.cpp 2007/06/18 06:03:50 46513 -@@ -71,7 +71,7 @@ - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - win->MoveWindow( - win->m_x - top_border, ---- wxWidgets/trunk/src/gtk/window.cpp 2007/05/30 13:55:09 46249 -+++ wxWidgets/trunk/src/gtk/window.cpp 2007/06/18 06:03:50 46513 -@@ -2738,7 +2738,7 @@ - right_border += default_border->right; - top_border += default_border->top; - bottom_border += default_border->bottom; -- g_free( default_border ); -+ gtk_border_free( default_border ); - } - } - diff --git a/wxGTK.spec b/wxGTK.spec index f2403d3..0c0f330 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -5,8 +5,8 @@ %define withodbc 0 Name: wxGTK -Version: 2.8.4 -Release: 7%{?dist} +Version: 2.8.7 +Release: 1%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -15,8 +15,6 @@ License: wxWidgets Library Licence Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -# http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=46513 -Patch0: wxGTK-2.8.4-bad-g_free.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -56,6 +54,7 @@ Provides: wxGTK-stc = %{version}-%{release} Obsoletes: compat-wxGTK2-stc < %{version}-%{release} Obsoletes: compat-wxGTK-stc < %{version}-%{release} +Requires: wxBase = %{version}-%{release} %description wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets @@ -69,6 +68,7 @@ Group: Development/Libraries Summary: Development files for the wxGTK2 library Requires: %{name} = %{version}-%{release} Requires: %{name}-gl = %{version}-%{release} +Requires: wxBase = %{version}-%{release} Requires: gtk2-devel Requires: libGL-devel, libGLU-devel Obsoletes: wxGTK2-devel < %{version}-%{release} @@ -95,6 +95,7 @@ Obsoletes: compat-wxGTK-gl < %{version}-%{release} %description gl OpenGL (a 3D graphics API) add-on for the wxWidgets library. + %if %{withodbc} %package odbc Summary: ODBC add-on for the wxWidgets library @@ -105,11 +106,22 @@ Requires: %{name} = %{version}-%{release} ODBC (a SQL database connectivity API) add-on for the wxWidgets library. %endif + +%package -n wxBase +Summary: Non-GUI support classes from the wxWidgets library +Group: System Environment/Libraries + +%description -n wxBase +Every wxWidgets application must link against this library. It contains +mandatory classes that any wxWidgets code depends on (like wxString) and +portability classes that abstract differences between platforms. wxBase can +be used to develop console mode applications -- it does not require any GUI +libraries or the X Window System. + + %prep %setup -q -%patch0 -p2 -b .badfree - sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -190,14 +202,19 @@ rm -rf $RPM_BUILD_ROOT %post gl -p /sbin/ldconfig %postun gl -p /sbin/ldconfig +%if %{withodbc} +%post odbc -p /sbin/ldconfig +%postun odbc -p /sbin/ldconfig +%endif + +%post -n wxBase -p /sbin/ldconfig +%postun -n wxBase -p /sbin/ldconfig + %files -f wxstd.lang %defattr(-,root,root,-) %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt %doc docs/licendoc.txt docs/preamble.txt docs/readme.txt -%{_libdir}/libwx_baseu-*.so.* -%{_libdir}/libwx_baseu_net-*.so.* -%{_libdir}/libwx_baseu_xml-*.so.* %{_libdir}/libwx_gtk2u_adv-*.so.* %{_libdir}/libwx_gtk2u_aui-*.so.* %{_libdir}/libwx_gtk2u_core-*.so.* @@ -236,7 +253,23 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libwx_gtk2u_odbc-*.so.* %endif +%files -n wxBase +%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt +%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt +%{_libdir}/libwx_baseu-*.so.* +%{_libdir}/libwx_baseu_net-*.so.* +%{_libdir}/libwx_baseu_xml-*.so.* + + %changelog +* Wed Feb 20 2008 Matthew Miller - 2.8.7-1 +- update to 2.8.7 (rh bug #369621, etc.) +- split base libs into separate wxBase package (rh bug #357961) +- okay, so, wxPython 2.8.7.1 seems to work fine against this version of the + library, so I'm dropping the kludgy-patch-to-2.8.7.1 thing. Please report + any compatibility problems with wxPython 2.8.7.1 and I'll fix them as they + come up. + * Tue Feb 19 2008 Fedora Release Engineering - 2.8.4-7 - Autorebuild for GCC 4.3