rpms/wxGTK/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 wxGTK.spec, 1.36, 1.37 wxGTK-2.8.4-bad-g_free.patch, 1.1, NONE

Wed Feb 20 21:39:39 UTC 2008

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6556

Modified Files:
	.cvsignore sources wxGTK.spec 
Removed Files:
	wxGTK-2.8.4-bad-g_free.patch 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	11 Jul 2007 18:24:06 -0000	1.8
+++ .cvsignore	20 Feb 2008 21:39:03 -0000	1.9
@@ -1 +1 @@
-wxGTK-2.8.4.tar.bz2
+wxGTK-2.8.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Jul 2007 18:24:06 -0000	1.8
+++ sources	20 Feb 2008 21:39:03 -0000	1.9
@@ -1 +1 @@
-22e42c1601d9759530c875ffa2c3c554  wxGTK-2.8.4.tar.bz2
+b25e85eeee524903214ebb520753f4bd  wxGTK-2.8.7.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wxGTK.spec	19 Feb 2008 13:09:12 -0000	1.36
+++ wxGTK.spec	20 Feb 2008 21:39:03 -0000	1.37
@@ -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 @@
 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 @@
 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 @@
 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 @@
 %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 @@
 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 @@
 %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 @@
 %{_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 <mattdm at mattdm.org> - 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 <rel-eng at fedoraproject.org> - 2.8.4-7
 - Autorebuild for GCC 4.3
 


--- wxGTK-2.8.4-bad-g_free.patch DELETED ---


