1
0

?base is wrong, use just base

OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=113
This commit is contained in:
Jan Engelhardt 2023-12-26 18:38:57 +00:00 committed by Git OBS Bridge
parent aec4e5cd3f
commit 8a82530537

View File

@ -23,7 +23,7 @@
%define variant suse %define variant suse
%define gtk_version 2 %define gtk_version 2
%define toolkit gtk%gtk_version %define toolkit gtk%gtk_version
%define base_packages 0 %define base_packages 1
%bcond_with webview %bcond_with webview
%endif %endif
@ -38,8 +38,7 @@
%define variant suse %define variant suse
%define gtk_version 3 %define gtk_version 3
%define toolkit gtk%gtk_version %define toolkit gtk%gtk_version
# build non-UI toolkit related packages %define base_packages 0
%define base_packages 1
%bcond_without webview %bcond_without webview
%endif %endif
@ -48,7 +47,7 @@
%define variant suse-nostl %define variant suse-nostl
%define gtk_version 3 %define gtk_version 3
%define toolkit gtk%gtk_version %define toolkit gtk%gtk_version
%define base_packages 1 %define base_packages 0
%bcond_with webview %bcond_with webview
%define extra_description This variant of wxWidgets is built without STL types (such as \ %define extra_description This variant of wxWidgets is built without STL types (such as \
std::string), and is provided for old programs which fail to use e.g. \ std::string), and is provided for old programs which fail to use e.g. \
@ -442,7 +441,7 @@ find docs/doxygen/out/html/ -iname \*.dot -print -delete
export VENDORTAG='-$variant' # only needed for non-MSW export VENDORTAG='-$variant' # only needed for non-MSW
%make_install %make_install
%if !0%{?base_packages:1} %if !0%{base_packages:1}
# Drop libraries already supplied by another packages # Drop libraries already supplied by another packages
rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \
"%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so
@ -515,7 +514,7 @@ export WX_TEST_WEBREQUEST_URL=0
%else %else
%if 0%{?base_packages:1} %if 0%{base_packages:1}
%files -n libwx_base-%variant-devel %files -n libwx_base-%variant-devel
%_libdir/libwx_baseu*.so %_libdir/libwx_baseu*.so
@ -573,7 +572,7 @@ export WX_TEST_WEBREQUEST_URL=0
%files -n libwx_%{toolkit}u_xrc-%variant%psonum %files -n libwx_%{toolkit}u_xrc-%variant%psonum
%_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}* %_libdir/libwx_%{toolkit}u_xrc-%variant.so.%{sonum}*
%if 0%{?base_packages:1} %if 0%{base_packages:1}
%if "%flavor" != "GTK3-nostl" %if "%flavor" != "GTK3-nostl"
%files -n %{base_name}-plugin-sound_sdlu-3_2 %files -n %{base_name}-plugin-sound_sdlu-3_2
%dir %_libdir/wx %dir %_libdir/wx
@ -592,7 +591,7 @@ export WX_TEST_WEBREQUEST_URL=0
%_datadir/bakefile %_datadir/bakefile
%_includedir/wx-%wx_minor %_includedir/wx-%wx_minor
%_libdir/*.so %_libdir/*.so
%if 0%{?base_packages:1} %if 0%{base_packages:1}
%exclude %_libdir/libwx_baseu* %exclude %_libdir/libwx_baseu*
%endif %endif
%dir %_libdir/wx %dir %_libdir/wx