X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9f7896861f734ce044ee8601ba2d8a6959c9d9e..f254e2424a5220e559e48205ace1114ea3e87f3f:/wxGTK.spec diff --git a/wxGTK.spec b/wxGTK.spec index 8727fa774a..82379d28bb 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -1,5 +1,5 @@ %define _prefix /usr -%define ver 2.9.0 +%define ver 2.9.2 %define ver2 2.9 %define rel 1 @@ -62,7 +62,7 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root Requires: %{wxbasename} = %{ver} %if %{portname} == gtk2 -BuildRequires: gtk+-2.0-devel +BuildRequires: gtk2-devel %else BuildRequires: gtk+-devel >= 1.2.0 %endif @@ -116,7 +116,7 @@ wxBase is a collection of C++ classes providing basic data structures (strings, lists, arrays), portable wrappers around many OS-specific funstions (file operations, time/date manipulations, threads, processes, sockets, shared library loading) as well as other utility classes (streams, archive and -compression). wxBase currently supports Win32, most Unix variants (Linux, +compression). wxBase currently supports Win32, most Unix variants (Linux, FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0). %package -n %{wxbasename}-devel @@ -128,23 +128,6 @@ Provides: wxBase-devel wxBase library - non-GUI support classes of the wxWidgets toolkit, header files. -%package contrib -Summary: The GTK+ %{gtkver} port of the wxWidgets library, contributed libraries. -Group: X11/Libraries -Requires: %{name} = %{ver} - -%description contrib -Contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWidgets library. - -%package contrib-devel -Summary: The GTK+ %{gtkver} port of the wxWidgets library -Group: X11/Libraries -Requires: %{name}-contrib = %{ver} -Requires: %{name}-devel = %{ver} - -%description contrib-devel -Header files for contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWidgets library. - %prep %setup -q -n wxGTK-%{ver} @@ -157,7 +140,7 @@ fi mkdir obj-shared cd obj-shared -../configure --prefix=%{_prefix} \ +../configure --prefix=%{_prefix} --libdir=%{_libdir} \ %if ! %{gtk2} --with-gtk=1 \ %else @@ -167,18 +150,15 @@ cd obj-shared --enable-unicode \ %else --disable-unicode \ - --with-odbc \ %endif --with-opengl $MAKE -cd contrib/src -$MAKE -cd ../../.. +cd .. mkdir obj-static cd obj-static -../configure --prefix=%{_prefix} \ +../configure --prefix=%{_prefix} --libdir=%{_libdir} \ %if ! %{gtk2} --with-gtk=1 \ %else @@ -189,14 +169,11 @@ cd obj-static --enable-unicode \ %else --disable-unicode \ - --with-odbc \ %endif --with-opengl $MAKE -cd contrib/src -$MAKE -cd ../../.. +cd .. make -C locale allmo @@ -208,22 +185,30 @@ rm -rf $RPM_BUILD_ROOT # --- wxBase headers list begins here --- cat <<EOF >wxbase-headers.files wx/afterstd.h +wx/any.h +wx/anystr.h wx/app.h wx/apptrait.h wx/archive.h wx/arrimpl.cpp wx/arrstr.h +wx/atomic.h +wx/base64.h wx/beforestd.h wx/buffer.h wx/build.h +wx/chartype.h +wx/checkeddelete.h wx/chkconf.h wx/clntdata.h +wx/cmdargs.h wx/cmdline.h wx/confbase.h wx/config.h wx/convauto.h wx/containr.h wx/cpp.h +wx/crt.h wx/datetime.h wx/datstrm.h wx/dde.h @@ -231,13 +216,16 @@ wx/debug.h wx/defs.h wx/dir.h wx/dlimpexp.h +wx/dlist.h wx/dynarray.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h +wx/evtloop.h wx/except.h wx/features.h +wx/flags.h wx/ffile.h wx/file.h wx/fileconf.h @@ -261,8 +249,8 @@ wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h -wx/isql.h -wx/isqlext.h +wx/kbdstate.h +wx/language.h wx/link.h wx/list.h wx/listimpl.cpp @@ -274,7 +262,9 @@ wx/memory.h wx/memtext.h wx/mimetype.h wx/module.h +wx/mousestate.h wx/msgout.h +wx/msgqueue.h wx/mstream.h wx/object.h wx/platform.h @@ -282,19 +272,26 @@ wx/platinfo.h wx/power.h wx/process.h wx/ptr_scpd.h +wx/ptr_shrd.h wx/recguard.h wx/regex.h +wx/scopedarray.h +wx/scopedptr.h wx/scopeguard.h +wx/sharedptr.h wx/snglinst.h wx/sstream.h wx/stack.h wx/stackwalk.h wx/stdpaths.h +wx/stdstream.h wx/stockitem.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h +wx/stringimpl.h +wx/stringops.h wx/strvararg.h wx/sysopt.h wx/tarstrm.h @@ -303,48 +300,68 @@ wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/timer.h +wx/tls.h wx/tokenzr.h +wx/tracker.h +wx/translation.h wx/txtstrm.h +wx/typeinfo.h wx/types.h +wx/unichar.h wx/uri.h +wx/ustring.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h +wx/weakref.h wx/wfstream.h wx/wx.h wx/wxchar.h +wx/wxcrt.h +wx/wxcrtbase.h +wx/wxcrtvararg.h wx/wxprec.h +wx/xlocale.h wx/xti.h wx/xtistrm.h wx/zipstrm.h wx/zstream.h +wx/meta/convertible.h +wx/meta/if.h +wx/meta/int2type.h +wx/meta/movable.h +wx/meta/pod.h +wx/fswatcher.h +wx/generic/fswatcher.h +wx/unix/app.h wx/unix/apptbase.h wx/unix/apptrait.h -wx/unix/execute.h -wx/unix/mimetype.h +wx/unix/chkconf.h +wx/unix/evtloop.h +wx/unix/evtloopsrc.h wx/unix/pipe.h -wx/unix/private.h -wx/unix/stackwalk.h wx/unix/stdpaths.h +wx/unix/stackwalk.h +wx/unix/tls.h +wx/unix/fswatcher_kqueue.h +wx/unix/execute.h +wx/unix/mimetype.h +wx/unix/fswatcher_inotify.h wx/fs_inet.h -wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h +wx/protocol/log.h wx/protocol/protocol.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/url.h -wx/unix/gsockunx.h wx/xml/xml.h wx/xtixml.h -wx/db.h -wx/dbkeyg.h -wx/dbtable.h EOF # --- wxBase headers list ends here --- cat <<EOF >wxbase-headers.paths @@ -468,9 +485,6 @@ cat <<EOF >wxbase-headers.paths %{_includedir}/wx-%{ver2}/wx/url.h %{_includedir}/wx-%{ver2}/wx/xml/xml.h %{_includedir}/wx-%{ver2}/wx/xtixml.h -%{_includedir}/wx-%{ver2}/wx/db.h -%{_includedir}/wx-%{ver2}/wx/dbkeyg.h -%{_includedir}/wx-%{ver2}/wx/dbtable.h %{_includedir}/wx-%{ver2}/wx/unix/apptbase.h %{_includedir}/wx-%{ver2}/wx/unix/apptrait.h %{_includedir}/wx-%{ver2}/wx/unix/execute.h @@ -495,10 +509,6 @@ find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROO cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir} rm -rf $RPM_BUILD_ROOT/_save_dir -# contrib stuff: -(cd obj-static/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) -(cd obj-shared/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) - # utils: (cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) @@ -555,31 +565,19 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %postun gl /sbin/ldconfig -%post contrib -/sbin/ldconfig - -%postun contrib -/sbin/ldconfig - -%post contrib-devel -/sbin/ldconfig - -%postun contrib-devel -/sbin/ldconfig - %files %defattr(-,root,root) %doc COPYING.LIB *.txt %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_aui-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_core-%{ver2}.so.* -%if !%{unicode} - %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so.* -%endif %{_libdir}/libwx_%{buildname}_html-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_media-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_propgrid-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_ribbon-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_richtext-%{ver2}.so.* +%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so.* %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so.* %files -n wx-i18n @@ -592,26 +590,27 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %{_libdir}/libwx_%{buildname}_adv-%{ver2}.so %{_libdir}/libwx_%{buildname}_aui-%{ver2}.so %{_libdir}/libwx_%{buildname}_core-%{ver2}.so -%if !%{unicode} - %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.so -%endif %{_libdir}/libwx_%{buildname}_gl-%{ver2}.so %{_libdir}/libwx_%{buildname}_html-%{ver2}.so -%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so +%{_libdir}/libwx_%{buildname}_media-%{ver2}.so +%{_libdir}/libwx_%{buildname}_propgrid-%{ver2}.so %{_libdir}/libwx_%{buildname}_qa-%{ver2}.so +%{_libdir}/libwx_%{buildname}_ribbon-%{ver2}.so %{_libdir}/libwx_%{buildname}_richtext-%{ver2}.so +%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.so # static libs %{_libdir}/libwx_%{buildname}_adv-%{ver2}.a %{_libdir}/libwx_%{buildname}_aui-%{ver2}.a %{_libdir}/libwx_%{buildname}_core-%{ver2}.a -%if !%{unicode} - %{_libdir}/libwx_%{buildname}_dbgrid-%{ver2}.a -%endif %{_libdir}/libwx_%{buildname}_gl-%{ver2}.a %{_libdir}/libwx_%{buildname}_html-%{ver2}.a +%{_libdir}/libwx_%{buildname}_media-%{ver2}.a +%{_libdir}/libwx_%{buildname}_propgrid-%{ver2}.a %{_libdir}/libwx_%{buildname}_qa-%{ver2}.a +%{_libdir}/libwx_%{buildname}_ribbon-%{ver2}.a %{_libdir}/libwx_%{buildname}_richtext-%{ver2}.a +%{_libdir}/libwx_%{buildname}_stc-%{ver2}.a %{_libdir}/libwx_%{buildname}_xrc-%{ver2}.a %dir %{_libdir}/wx %{_libdir}/wx/config/%{wxconfig} @@ -639,67 +638,3 @@ rm -f %{_bindir}/%{wxbaseconfiglink} %files gl %defattr(-,root,root) %{_libdir}/libwx_%{buildname}_gl-%{ver2}.so.* - -%files contrib -%defattr(-,root,root) -%{_libdir}/libwx_%{buildname}_animate-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_fl-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_plot-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so.* -%{_libdir}/libwx_%{buildname}_svg-%{ver2}.so.* - -# static libs -%{_libdir}/libwx_%{buildname}_animate-%{ver2}.a -%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.a -%{_libdir}/libwx_%{buildname}_fl-%{ver2}.a -%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.a -%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.a -%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.a -%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.a -%{_libdir}/libwx_%{buildname}_plot-%{ver2}.a -%{_libdir}/libwx_%{buildname}_stc-%{ver2}.a -%{_libdir}/libwx_%{buildname}_svg-%{ver2}.a - -%files contrib-devel -%defattr(-,root,root) -%dir %{_includedir}/wx-%{ver2}/wx/animate -%{_includedir}/wx-%{ver2}/wx/animate/* -%{_libdir}/libwx_%{buildname}_animate-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/deprecated -%{_includedir}/wx-%{ver2}/wx/deprecated/* -%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/fl -%{_includedir}/wx-%{ver2}/wx/fl/* -%{_libdir}/libwx_%{buildname}_fl-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/gizmos -%{_includedir}/wx-%{ver2}/wx/gizmos/* -%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.so -%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/mmedia -%{_includedir}/wx-%{ver2}/wx/mmedia/* -%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/ogl -%{_includedir}/wx-%{ver2}/wx/ogl/* -%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/plot -%{_includedir}/wx-%{ver2}/wx/plot/* -%{_libdir}/libwx_%{buildname}_plot-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/stc -%{_includedir}/wx-%{ver2}/wx/stc/* -%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/svg -%{_includedir}/wx-%{ver2}/wx/svg/* -%{_libdir}/libwx_%{buildname}_svg-%{ver2}.so