From 8a82530537774c0485736573bf5a64cfbf0e6cf3342596b52542448433bb3876 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 26 Dec 2023 18:38:57 +0000 Subject: [PATCH] ?base is wrong, use just base OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=113 --- wxWidgets-3_2.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index aecd214..a6bec36 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -23,7 +23,7 @@ %define variant suse %define gtk_version 2 %define toolkit gtk%gtk_version -%define base_packages 0 +%define base_packages 1 %bcond_with webview %endif @@ -38,8 +38,7 @@ %define variant suse %define gtk_version 3 %define toolkit gtk%gtk_version -# build non-UI toolkit related packages -%define base_packages 1 +%define base_packages 0 %bcond_without webview %endif @@ -48,7 +47,7 @@ %define variant suse-nostl %define gtk_version 3 %define toolkit gtk%gtk_version -%define base_packages 1 +%define base_packages 0 %bcond_with webview %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. \ @@ -442,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 !0%{base_packages:1} # Drop libraries already supplied by another packages rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ "%buildroot/%_libdir/wx/%wx_minor"/sound_sdlu-*.so @@ -515,7 +514,7 @@ export WX_TEST_WEBREQUEST_URL=0 %else -%if 0%{?base_packages:1} +%if 0%{base_packages:1} %files -n libwx_base-%variant-devel %_libdir/libwx_baseu*.so @@ -573,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 0%{base_packages:1} %if "%flavor" != "GTK3-nostl" %files -n %{base_name}-plugin-sound_sdlu-3_2 %dir %_libdir/wx @@ -592,7 +591,7 @@ export WX_TEST_WEBREQUEST_URL=0 %_datadir/bakefile %_includedir/wx-%wx_minor %_libdir/*.so -%if 0%{?base_packages:1} +%if 0%{base_packages:1} %exclude %_libdir/libwx_baseu* %endif %dir %_libdir/wx