diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index d2d9d12..8410109 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -400,7 +400,7 @@ export VENDORTAG='-$variant' # only needed for non-MSW %make_install %if !%base_packages # Drop libraries already supplied by another packages -rm -f "%buildroot/%_libdir"/libwx_baseu{,_net,_xml}-%variant.so.%{sonum}* \ +rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so %endif rm -Rf %buildroot/%_datadir/locale @@ -443,7 +443,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %if %base_packages %files -n libwx_base-devel -%_libdir/libwx_baseu*-%variant.so +%_libdir/libwx_baseu*.so %files -n libwx_baseu-%variant%psonum %_libdir/libwx_baseu-%variant.so.%{sonum}* @@ -518,7 +518,6 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %_datadir/bakefile %_includedir/wx-%wx_minor %_libdir/*.so -%exclude %_libdir/libwx_baseu*-%variant.so %dir %_libdir/wx %_libdir/wx/config %_libdir/wx/include