X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/671a85ea56c05abf690ed46e27798c65d53ecb6e..7c9955536ab6cef75f24b0abdbf58cb80d637b8f:/wxX11.spec?ds=inline diff --git a/wxX11.spec b/wxX11.spec index 2aab04ada1..22efc08f0f 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -1,5 +1,5 @@ %define pref /usr -%define ver 2.5.1 +%define ver 2.5.2 %define ver2 2.5 %define rel 1 @@ -160,6 +160,7 @@ wx/dde.h wx/debug.h wx/defs.h wx/dir.h +wx/dlimpexp.h wx/dynarray.h wx/dynlib.h wx/dynload.h @@ -209,6 +210,7 @@ wx/ptr_scpd.h wx/regex.h wx/scopeguard.h wx/snglinst.h +wx/stack.h wx/stopwatch.h wx/strconv.h wx/stream.h @@ -265,7 +267,7 @@ wx/dbtable.h EOF # --- wxBase headers list ends here --- for f in `cat wxbase-headers-list` ; do - rm -f $RPM_BUILD_ROOT%{_includedir}/$f + rm -f $RPM_BUILD_ROOT%{_includedir}/wx-*/$f done # list of all core headers: @@ -275,6 +277,11 @@ find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >cor (cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install) (cd obj-shared/contrib/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/* +rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/* + %clean rm -rf $RPM_BUILD_ROOT @@ -290,22 +297,6 @@ rm -rf $RPM_BUILD_ROOT %postun gl /sbin/ldconfig -%post devel -# Install wx-config if there isn't any -if test ! -f %{_bindir}/wx-config ; then - ln -sf %{wxconfigname} %{_bindir}/wx-config -fi - -%preun devel -# Remove wx-config if it points to this package -if test -f %{_bindir}/wx-config -a -f /usr/bin/md5sum ; then - SUM1=`md5sum %{_bindir}/%{wxconfigname} | cut -c 0-32` - SUM2=`md5sum %{_bindir}/wx-config | cut -c 0-32` - if test "x$SUM1" = "x$SUM2" ; then - rm -f %{_bindir}/wx-config - fi -fi - %files %defattr(-,root,root) @@ -356,42 +347,42 @@ fi %files contrib-devel %defattr(-,root,root) %{_bindir}/wxrc -%dir %{_includedir}/wx/animate -%{_includedir}/wx/animate/* +%dir %{_includedir}/wx-*/wx/animate +%{_includedir}/wx-*/wx/animate/* %{_libdir}/libwx_%{portname}*_animate*.so -%dir %{_includedir}/wx/deprecated -%{_includedir}/wx/deprecated/* +%dir %{_includedir}/wx-*/wx/deprecated +%{_includedir}/wx-*/wx/deprecated/* %{_libdir}/libwx_%{portname}*_deprecated*.so -%dir %{_includedir}/wx/fl -%{_includedir}/wx/fl/* +%dir %{_includedir}/wx-*/wx/fl +%{_includedir}/wx-*/wx/fl/* %{_libdir}/libwx_%{portname}*_fl*.so -%dir %{_includedir}/wx/gizmos -%{_includedir}/wx/gizmos/* +%dir %{_includedir}/wx-*/wx/gizmos +%{_includedir}/wx-*/wx/gizmos/* %{_libdir}/libwx_%{portname}*_gizmos*.so -%dir %{_includedir}/wx/mmedia -%{_includedir}/wx/mmedia/* +%dir %{_includedir}/wx-*/wx/mmedia +%{_includedir}/wx-*/wx/mmedia/* %{_libdir}/libwx_%{portname}*_mmedia*.so -%dir %{_includedir}/wx/ogl -%{_includedir}/wx/ogl/* +%dir %{_includedir}/wx-*/wx/ogl +%{_includedir}/wx-*/wx/ogl/* %{_libdir}/libwx_%{portname}*_ogl*.so -%dir %{_includedir}/wx/plot -%{_includedir}/wx/plot/* +%dir %{_includedir}/wx-*/wx/plot +%{_includedir}/wx-*/wx/plot/* %{_libdir}/libwx_%{portname}*_plot*.so -%dir %{_includedir}/wx/stc -%{_includedir}/wx/stc/* +%dir %{_includedir}/wx-*/wx/stc +%{_includedir}/wx-*/wx/stc/* %{_libdir}/libwx_%{portname}*_stc*.so -%dir %{_includedir}/wx/svg -%{_includedir}/wx/svg/* +%dir %{_includedir}/wx-*/wx/svg +%{_includedir}/wx-*/wx/svg/* %{_libdir}/libwx_%{portname}*_svg*.so -%dir %{_includedir}/wx/xrc -%{_includedir}/wx/xrc/* +%dir %{_includedir}/wx-*/wx/xrc +%{_includedir}/wx-*/wx/xrc/* %{_libdir}/libwx_%{portname}*_xrc*.so