rpms/wxGTK/FC-5 sources, 1.4, 1.5 wxGTK.spec, 1.17, 1.18 wxGTK-2.6.2-gcc41stringh.patch, 1.1, NONE wxGTK-2.6.2-intl_cpp.patch, 1.1, NONE wxGTK-2.6.2-socketclosefix.patch, 1.1, NONE
Matthew Miller (mattdm)
fedora-extras-commits at redhat.com
Fri Apr 14 14:07:21 UTC 2006
Author: mattdm
Update of /cvs/extras/rpms/wxGTK/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28239
Modified Files:
sources wxGTK.spec
Removed Files:
wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-intl_cpp.patch
wxGTK-2.6.2-socketclosefix.patch
Log Message:
Update to wxGTK 2.6.2; massive changes (see development package and
changelog for details).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Nov 2005 19:57:40 -0000 1.4
+++ sources 14 Apr 2006 14:07:21 -0000 1.5
@@ -1 +1 @@
-ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2
+3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2
Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/wxGTK.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wxGTK.spec 13 Feb 2006 19:50:49 -0000 1.17
+++ wxGTK.spec 14 Apr 2006 14:07:21 -0000 1.18
@@ -1,8 +1,12 @@
%define x11libdir %{_prefix}/X11R6/%{_lib}
+# Option - build an ODBC subpackage using unixODBC. (This is currently
+# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
+%define withodbc 0
+
Name: wxGTK
-Version: 2.6.2
-Release: 5%{?dist}
+Version: 2.6.3
+Release: 2.6.3.2.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
@@ -11,15 +15,16 @@
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0: wxGTK-2.6.2-intl_cpp.patch
-Patch1: wxGTK-2.6.2-socketclosefix.patch
-Patch2: wxGTK-2.6.2-gcc41stringh.patch
+Patch0: wxGTK-2.6.3.2-cvs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires: mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires: libGL-devel, libGLU-devel
+%if %{withodbc}
+BuildRequires: unixODBC-devel
+%endif
# all of these are for previous Fedora Extras sub-packages
Obsoletes: wxGTK2 < 2.6.2-1
@@ -68,14 +73,22 @@
Provides: wxGTK2-gl = %{version}-%{release}
%description gl
-OpenGL add-on for the wxWidgets library.
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
+%if %{withodbc}
+%package odbc
+Summary: ODBC add-on for the wxWidgets library
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description odbc
+ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
+%endif
%prep
%setup -q
-%patch0 -p0 -b .intlcpp
-%patch1 -p1 -b .socketclose
-%patch2 -p1 -b .gcc41
+
+%patch0 -p1 -b .2.6.3.2
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
@@ -89,6 +102,9 @@
--x-libraries=%{x11libdir} \
--with-gtk=2 \
--with-opengl \
+%if %{withodbc}
+ --with-odbc \
+%endif
--with-sdl \
--with-gnomeprint \
--enable-shared \
@@ -170,8 +186,37 @@
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2u_gl-*.so.*
+%if %{withodbc}
+%files odbc
+%defattr(-,root,root,-)
+%{_libdir}/libwx_gtk2u_odbc-*.so.*
+%endif
%changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
+
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1
+- 2.6.3 final
+- remove the locale_install thing -- that was just an issue with using the
+ release candidate.
+
+* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
+- update to 2.6.3-rc2 package
+- all patches now upstream -- removing 'em.
+- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
+ since that's all there is for the release candidate. I'm operating under
+ the assumption that we'll have a wxGTK source tarball in the future --
+ otherwise, I'm going to eventually have to change the name of this
+ package again. :)
+- add ODBC support via unixODBC as subpackage (see bug #176950)
+- wait, no; comment out ODBC support as it doesn't build...
+- add explicit make locale_install; apparently not done as part of
+ the general 'make install' anymore.
+
* Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
- rebuild in preparation for FC5
@@ -210,7 +255,7 @@
Add dist tag.
- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
-
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
- update to 2.6.1
- from Michael Schwendt in 2.4.2-11 package: build-require
xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU
--- wxGTK-2.6.2-gcc41stringh.patch DELETED ---
--- wxGTK-2.6.2-intl_cpp.patch DELETED ---
--- wxGTK-2.6.2-socketclosefix.patch DELETED ---
More information about the scm-commits
mailing list