X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7db064f60f2d60bcfea44a9973a18e6c2bf2161d..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/wxMotif.spec?ds=sidebyside diff --git a/wxMotif.spec b/wxMotif.spec index 32ecaadceb..db4d569d2b 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.9.1 +%define ver 2.9.4 %define ver2 2.9 %define rel 1 @@ -7,7 +7,7 @@ %define name wx-%{portname} %define wxbasename wx-base -%define wxconfig %{portname}-ansi-release-%{ver2} +%define wxconfig %{portname}-ansi-%{ver2} %define wxconfiglink wx%{portname}-%{ver2}-config Summary: The Motif/Lesstif port of the wxWidgets library @@ -59,23 +59,6 @@ Requires: %{name}-devel = %{ver} %description static Static libraries for wxMotif. You need them if you want to link statically against wxMotif. -%package contrib -Summary: Contrib libraries for wxMotif -Group: X11/Libraries -Requires: %{name} = %{ver} - -%description contrib -Contrib libraries for wxMotif - -%package contrib-devel -Summary: Contrib libraries for wxMotif -Group: X11/Libraries -Requires: %{name}-contrib = %{ver} -Requires: %{name}-devel = %{ver} - -%description contrib-devel -Header files for contributed libraries for wxMotif. - %prep %setup -q -n wxMotif-%{ver} @@ -90,10 +73,7 @@ mkdir obj-shared cd obj-shared ../configure --prefix=%{pref} --with-motif --with-opengl $MAKE - -cd contrib/src -$MAKE -cd ../../.. +cd .. mkdir obj-static cd obj-static @@ -148,6 +128,8 @@ wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h +wx/eventfilter.h +wx/evtloop.h wx/except.h wx/features.h wx/flags.h @@ -175,6 +157,7 @@ wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/kbdstate.h +wx/language.h wx/link.h wx/list.h wx/listimpl.cpp @@ -188,7 +171,9 @@ wx/mimetype.h wx/module.h wx/mousestate.h wx/msgout.h +wx/msgqueue.h wx/mstream.h +wx/numformatter.h wx/object.h wx/platform.h wx/platinfo.h @@ -198,6 +183,7 @@ wx/ptr_scpd.h wx/ptr_shrd.h wx/recguard.h wx/regex.h +wx/rtti.h wx/scopedarray.h wx/scopedptr.h wx/scopeguard.h @@ -222,10 +208,12 @@ wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp +wx/time.h wx/timer.h wx/tls.h wx/tokenzr.h wx/tracker.h +wx/translation.h wx/txtstrm.h wx/typeinfo.h wx/types.h @@ -236,6 +224,7 @@ wx/utils.h wx/variant.h wx/vector.h wx/version.h +wx/versioninfo.h wx/volume.h wx/weakref.h wx/wfstream.h @@ -247,13 +236,20 @@ wx/wxcrtvararg.h wx/wxprec.h wx/xlocale.h wx/xti.h +wx/xti2.h wx/xtistrm.h +wx/xtictor.h +wx/xtihandler.h +wx/xtiprop.h +wx/xtitypes.h wx/zipstrm.h wx/zstream.h wx/meta/convertible.h wx/meta/if.h +wx/meta/implicitconversion.h wx/meta/int2type.h wx/meta/movable.h +wx/meta/pod.h wx/fswatcher.h wx/generic/fswatcher.h wx/unix/app.h @@ -292,10 +288,6 @@ done # list of all core headers: find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files -# contrib stuff: -(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install) -(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install) - # remove wxBase files so that RPM doesn't complain about unpackaged files: rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base* rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/* @@ -336,18 +328,6 @@ rm -f %{_bindir}/%{wxconfiglink} %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 @@ -380,52 +360,3 @@ rm -f %{_bindir}/%{wxconfiglink} %defattr (-,root,root) %{_libdir}/libwx_%{portname}*_*-%{ver2}.a -%files contrib -%defattr(-,root,root) -%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so.* -%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so.* - -%files contrib-devel -%defattr(-,root,root) -%dir %{_includedir}/wx-%{ver2}/wx/animate -%{_includedir}/wx-%{ver2}/wx/animate/* -%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/deprecated -%{_includedir}/wx-%{ver2}/wx/deprecated/* -%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/fl -%{_includedir}/wx-%{ver2}/wx/fl/* -%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/gizmos -%{_includedir}/wx-%{ver2}/wx/gizmos/* -%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/mmedia -%{_includedir}/wx-%{ver2}/wx/mmedia/* -%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/ogl -%{_includedir}/wx-%{ver2}/wx/ogl/* -%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/plot -%{_includedir}/wx-%{ver2}/wx/plot/* -%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/stc -%{_includedir}/wx-%{ver2}/wx/stc/* -%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so - -%dir %{_includedir}/wx-%{ver2}/wx/svg -%{_includedir}/wx-%{ver2}/wx/svg/* -%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so