rpms/wxGTK/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wxGTK.spec, 1.13, 1.14
Matthew Miller (mattdm)
fedora-extras-commits at redhat.com
Mon Nov 28 19:57:42 UTC 2005
Author: mattdm
Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8192
Modified Files:
.cvsignore sources wxGTK.spec
Log Message:
update to 2.6.2 -- big changes, will break all sorts of stuff. :)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 05:32:41 -0000 1.3
+++ .cvsignore 28 Nov 2005 19:57:40 -0000 1.4
@@ -1 +1 @@
-wxGTK-2.4.2.tar.bz2
+wxGTK-2.6.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 05:32:41 -0000 1.3
+++ sources 28 Nov 2005 19:57:40 -0000 1.4
@@ -1 +1 @@
-cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2
+ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2
Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wxGTK.spec 8 May 2005 10:39:34 -0000 1.13
+++ wxGTK.spec 28 Nov 2005 19:57:40 -0000 1.14
@@ -1,203 +1,118 @@
%define x11libdir %{_prefix}/X11R6/%{_lib}
Name: wxGTK
-Version: 2.4.2
-Release: 12
-Summary: GTK+ port of the wxWidgets GUI library
-License: BSD
+Version: 2.6.2
+Release: 2%{?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
+# change to be "wxWidgets License" once that is approved by OSI.)
+License: wxWidgets Library Licence
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0: wxGTK-2.4.2-privates.patch
-Patch1: wxGTK-2.4.2-aclocal18.patch
-Patch2: wxGTK-2.4.2-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gtk+-devel gtk2-devel zlib-devel >= 1.1.4
-BuildRequires: libpng-devel libjpeg-devel libtiff-devel
-BuildRequires: libGL libGLU
-Requires: %{name}-common = %{version}-%{release}
+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
+
+# all of these are for previous Fedora Extras sub-packages
+Obsoletes: wxGTK2 < %{version}-%{release}
+Provides: wxGTK2 = %{version}-%{release}
+Obsoletes: wxGTK-common < %{version}-%{release}
+Provides: wxGTK-common = %{version}-%{release}
+Obsoletes: wxGTK2-xrc < %{version}-%{release}
+Obsoletes: wxGTK-xrc < %{version}-%{release}
+Provides: wxGTK2-xrc = %{version}-%{release}
+Provides: wxGTK-xrc = %{version}-%{release}
+Obsoletes: wxGTK2-stc < %{version}-%{release}
+Obsoletes: wxGTK-stc < %{version}-%{release}
+Provides: wxGTK2-stc = %{version}-%{release}
+Provides: wxGTK-stc = %{version}-%{release}
%description
-wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
+wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.
+
%package devel
Group: Development/Libraries
-Summary: Development files for the wxGTK library
+Summary: Development files for the wxGTK2 library
Requires: %{name} = %{version}-%{release}
-Requires: %{name}-common-devel = %{version}-%{release}
Requires: %{name}-gl = %{version}-%{release}
-Requires: %{name}-stc = %{version}-%{release}
-Requires: %{name}-xrc = %{version}-%{release}
-Requires: gtk+-devel
-Conflicts: %{name}2-devel
-
-%description devel
-This package includes files needed to link with the wxGTK library.
-
-%package -n %{name}2
-Group: System Environment/Libraries
-Summary: %{name}2 is the GTK2 port of the wxWidgets GUI library
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n %{name}2
-wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
-GUI library, offering classes for all common GUI controls as well as a
-comprehensive set of helper classes for most common application tasks,
-ranging from networking to HTML display and image manipulation.
-
-%package -n %{name}2-devel
-Group: Development/Libraries
-Summary: Development files for the wxGTK2 library
-Requires: %{name}2 = %{version}-%{release}
-Requires: %{name}-common-devel = %{version}-%{release}
-Requires: %{name}2-gl = %{version}-%{release}
-Requires: %{name}2-stc = %{version}-%{release}
-Requires: %{name}2-xrc = %{version}-%{release}
Requires: gtk2-devel
-Conflicts: %{name}-devel
+Obsoletes: wxGTK2-devel < %{version}-%{release}
+Provides: wxGTK2-devel = %{version}-%{release}
+Obsoletes: wxGTK-common-devel < %{version}-%{release}
+Provides: wxGTK-common-devel = %{version}-%{release}
-%description -n %{name}2-devel
+%description devel
This package include files needed to link with the wxGTK2 library.
-%package common
-Group: System Environment/Libraries
-Summary: wxGTK* common files
-
-%description common
-Common files for wxWidgets/GTK1 and GTK2.
-
-%package common-devel
-Group: Development/Libraries
-Summary: wxGTK* common development files
-
-%description common-devel
-Common development files for wxWidgets/GTK1 and GTK2.
%package gl
Summary: OpenGL add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
+Obsoletes: wxGTK2-gl < %{version}-%{release}
+Provides: wxGTK2-gl = %{version}-%{release}
-%description gl
-%{summary}.
-
-%package -n %{name}2-gl
-Summary: OpenGL add-on for the wxWidgets library
-Group: System Environment/Libraries
-Requires: %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-gl
-%{summary}.
-
-%package stc
-Summary: Styled text control add-on for the wxWidgets library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description stc
-Styled text control add-on for wxGTK. Based on the Scintillia project.
-
-%package -n %{name}2-stc
-Summary: Styled text control add-on for the wxWidgets library
-Group: System Environment/Libraries
-Requires: %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-stc
-Styled text control add-on for wxGTK2. Based on the Scintillia project.
-
-%package xrc
-Summary: The XML-based resource system for the wxWidgets library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK 1.2 backend
-
-%package -n %{name}2-xrc
-Summary: The XML-based resource system for the wxWidgets library
-Group: System Environment/Libraries
-Requires: %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK2 backend.
+%description gl
+OpenGL add-on for the wxWidgets library.
%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .privates
-%patch1 -b .aclocal18
-%patch2 -p1 -b .gcc4
+%setup -q
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
%build
-mkdir _gtk1 _gtk2
-export CC="%{__cc}"
-export CXX="%{__cxx}"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export GDK_USE_XFT=1
+
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).
-
-cd _gtk1
-../configure \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
- --x-libraries=%{x11libdir} \
- --with-opengl \
- --enable-shared \
- --enable-soname \
- --disable-optimise
-make %{?_smp_mflags}
-make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ../_gtk2
-../configure \
- --prefix=%{_prefix} \
- --libdir=%{_libdir} \
+%configure \
--x-libraries=%{x11libdir} \
+ --with-gtk=2 \
--with-opengl \
+ --with-sdl \
+ --with-gnomeprint \
--enable-shared \
--enable-soname \
--disable-optimise \
- --enable-gtk2
+ --enable-debug_info \
+ --enable-unicode \
+ --enable-compat22
+
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ..
-
+make %{?_smp_mflags} -C contrib/src/ogl
+make %{?_smp_mflags} -C contrib/src/gizmos
+make %{?_smp_mflags} -C contrib/src/animate
%install
rm -rf $RPM_BUILD_ROOT
-# Since we're not using %%configure, we would really like to use
-# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
-# sync. Unfortunately that does not work.
-cd _gtk1
-%makeinstall
-%makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ../_gtk2
%makeinstall
+
%makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ..
+%makeinstall -C contrib/src/ogl
+%makeinstall -C contrib/src/gizmos
+%makeinstall -C contrib/src/animate
+
+# this ends up being a symlink into the buildroot directly --
+# not what we want!
+rm $RPM_BUILD_ROOT%{_bindir}/wx-config
+ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.6 $RPM_BUILD_ROOT%{_bindir}/wx-config
%find_lang wxstd
-
+%find_lang wxmsw
+cat wxmsw.lang >> wxstd.lang
%clean
rm -rf $RPM_BUILD_ROOT
@@ -206,109 +121,140 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n %{name}2 -p /sbin/ldconfig
-%postun -n %{name}2 -p /sbin/ldconfig
-
-%post devel
-ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-config
-
-%post -n %{name}2-devel
-ln -sf $(basename %{_bindir}/wxgtk2*-config) %{_bindir}/wx-config
-
%post gl -p /sbin/ldconfig
%postun gl -p /sbin/ldconfig
-%post -n %{name}2-gl -p /sbin/ldconfig
-%postun -n %{name}2-gl -p /sbin/ldconfig
-
-%post stc -p /sbin/ldconfig
-%postun stc -p /sbin/ldconfig
-
-%post -n %{name}2-stc -p /sbin/ldconfig
-%postun -n %{name}2-stc -p /sbin/ldconfig
-
-%post xrc -p /sbin/ldconfig
-%postun xrc -p /sbin/ldconfig
-
-%post -n %{name}2-xrc -p /sbin/ldconfig
-%postun -n %{name}2-xrc -p /sbin/ldconfig
-
-%files
+%files -f wxstd.lang
%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk-*.so.*
+%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_libdir}/libwx_baseu-*.so.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+%{_libdir}/libwx_gtk2u_adv-*.so.*
+%{_libdir}/libwx_gtk2u_animate-*.so.*
+%{_libdir}/libwx_gtk2u_core-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
+%{_libdir}/libwx_gtk2u_html-*.so.*
+%{_libdir}/libwx_gtk2u_media-*.so.*
+%{_libdir}/libwx_gtk2u_ogl-*.so.*
+%{_libdir}/libwx_gtk2u_xrc-*.so.*
+%{_libdir}/libwx_gtk2u_stc-*.so.*
+%{_libdir}/libwx_gtk2u_qa-*.so.*
%files devel
%defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk-*-config
-%{_libdir}/libwx_gtk[-_]*.so
-%{_libdir}/wx/include/gtk-*
-
-%files -n %{name}2
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2-*.so.*
-
-%files -n %{name}2-devel
-%defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk2*-config
-%{_libdir}/libwx_gtk2[-_]*.so
-%{_libdir}/wx/include/gtk2*
-
-%files common -f wxstd.lang
-%defattr(-,root,root,-)
-%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_bindir}/wx-config
+%{_bindir}/wxrc*
+%{_includedir}/wx-2.6
+%{_libdir}/libwx_*.so
%dir %{_libdir}/wx
-%{_datadir}/wx
-
-%files common-devel
-%defattr(-,root,root,-)
-%{_datadir}/aclocal/*
-%{_includedir}/wx
%dir %{_libdir}/wx/include
+%{_libdir}/wx/include/gtk2*
+%dir %{_libdir}/wx/config
+%{_libdir}/wx/config/gtk2*
+%{_datadir}/aclocal/*
+%{_datadir}/bakefile/presets/
%files gl
%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_gl-*.so.*
-
-%files -n %{name}2-gl
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_gl-*.so.*
-
-%files stc
-%defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk_stc-*.so.*
-
-%files -n %{name}2-stc
-%defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk2_stc-*.so.*
-
-%files xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_xrc-*.so.*
-
-%files -n %{name}2-xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_xrc-*.so.*
+%{_libdir}/libwx_gtk2u_gl-*.so.*
%changelog
-* Sun May 8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
-- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
- x86_64
-
-* Sat May 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
-- Add BR libGL and libGLU to fix FC4 build failure
- (alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).
-
-* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
-- Added patch from Ignacio and Denis to fix build with gcc4
-
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Nov 28 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-2
+- implemented some suggestions from Matthias Saou:
+- removed extraneous / from last line of ./configure
+- removed -n from setup macro, since we're now actually using the
+ standard name
+- don't use summary macro in opengl subpackage, as it's not clear which
+ summary should get used
+- don't bother setting CC, CXX, etc., as configure script does that
+- move libdir/wx to devel subpackage
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-1
+- ready for actually putting into Extras
+- update mesa buildreqs for new split-up xorg packaging
+- libgnomeprint22-devel -> libgnomeprintui22-devel
+
+* Tue Oct 04 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.6.2-0.1
+- Update to 2.6.2.
+- Include the sample wx bakefiles.
+- Include new .mo files.
+- From Paul Johnson:
+ Change license to wxWidgets due to concerns over trademark infringement.
+ Add dist tag.
+- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
+
+
+- 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
+ deps aren't provided in FC3, so not using that).
+- from Thorsten Leemhuis in 2.4.2-12 package: sed -i -e
+ 's|/usr/lib\b|%%{_libdir}|' in configure also to fix x86_64
+- properly include older 2.4.x changelog
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.1
+- include libwx_gtk2u_gizmos_xrc in file listing
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.0
+- update to 2.6.0 final release
+- configure now wants "--with-gtk=2" instead of "--enable-gtk2".
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.2
+- removed provides: wxWidgets/wxWidgets devel -- handy for compatibility
+ with unmodified generic source packages, but not so good for
+ repeatable builds.
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.1
+- whoops -- forgot to remove a reference to the "common" package
+- version-release for obsoletes/provides
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0
+- remove BU-specific oddities for fedora an idea for a simplied future....
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.2
+- whoops -- forgot "Provides: wxGTK2-devel".
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.1
+- update to 2.5.5
+
+* Sat Mar 5 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.3
+- Obsolete & provide GTK-xrc, wxGTK-stc, to provide clean upgrade path
+
+* Tue Mar 1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.2
+- enable wxWindows 2.2 compatibility (for compatibility with 2.4 rpm,
+ ironically).
+
+* Tue Mar 1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.1
+- update to 2.5.4 -- the devel version is where all the fun is.
+- rebase to updated FE 2.4.2 package
+- license isn't "BSD" -- it's "wxWindows Library Licence".
+- make gtk2-only -- gtk 1.0.x is no longer supported, and 1.2.x is
+ being phased out. 2.x is the way to go.
+- all current patches no longer necessary (upstream)
+- roll "common" subpackage in to main package -- no longer makes sense
+ to split it out with gtk+ gone
+- use SDL, which will make this use Alsa for sound. I believe.
+- add gnomeprint support
+- add enable-debug_info for debuginfo package
+- enable unicode
+- use GDK_USE_XFT to enable Pango and fontconfig
+- xrc moved from contrib to base -- making it no longer a subpackage
+- making stc part of base too -- it's tiny, and doesn't introduce any
+ additional deps
+- leaving gl as a subpackage, though, since it's the only part that
+ requires GL libs.
+- add 'ogl' 2d drawing lib from contrib (needed for wxPython)
+- add 'gizmos' from contrib (needed for wxPython)
+- make wx-config actually part of the package, since there's no need
+ to mess with moving it around
+- the various afm fonts are gone in 2.5....
+- use configure macro
+- add provides for wxWidgets and wxWidgets-devel, because that
+ seems like a good idea.
* Sun Jan 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4.2-8
- Fix wx-config for x86_64 (#145508).
More information about the fedora-extras-commits
mailing list