diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index eecc69a..806a66c 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -441,7 +441,7 @@ find docs/doxygen/out/html/ -iname \*.dot -print -delete export VENDORTAG='-$variant' # only needed for non-MSW %make_install -%if !0%{base_packages:1} +%if !%base_packages # Drop libraries already supplied by another packages rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so @@ -514,7 +514,7 @@ export WX_TEST_WEBREQUEST_URL=0 %else -%if 0%{base_packages:1} +%if %base_packages %files -n libwx_base-%variant-devel %_libdir/libwx_baseu*.so @@ -572,7 +572,7 @@ export WX_TEST_WEBREQUEST_URL=0 %files -n libwx_%{toolkit}u_xrc-%variant%psonum %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* -%if 0%{base_packages:1} +%if %base_packages %if "%flavor" != "GTK3-nostl" %files -n %{base_name}-plugin-sound_sdlu-3_2 %dir %_libdir/wx @@ -591,7 +591,7 @@ export WX_TEST_WEBREQUEST_URL=0 %_datadir/bakefile %_includedir/wx-%wx_minor %_libdir/*.so -%if 0%{base_packages:1} +%if %base_packages %exclude %_libdir/libwx_baseu* %endif %dir %_libdir/wx