From d20b3a68b43f459ec07908d945780575a40c1e88c183bdf2f4227abf458ffffb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 20 Nov 2020 11:55:56 +0000 Subject: [PATCH] rework that base-devel package OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=81 --- wxWidgets-3_2.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 8410109..c324e2d 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -132,14 +132,14 @@ backends. Applications can be created for different GUIs (GTK+, Motif, MS Windows, MacOS X, Windows CE, GPE) from the same source code. -%package -n libwx_base-devel +%package -n libwx_base-%variant-devel Summary: Development files for %name Group: Development/Libraries/C and C++ Requires: libwx_baseu-%variant%psonum = %version Requires: libwx_baseu_net-%variant%psonum = %version Requires: libwx_baseu_xml-%variant%psonum = %version -%description -n libwx_base-devel +%description -n libwx_base-%variant-devel wxWidgets is a C++ library abstraction layer for a number of GUI backends. This package is a build artifact and need not be manually installed. @@ -320,7 +320,7 @@ Requires: libwx_%{toolkit}u_stc-%variant%psonum = %version Requires: libwx_%{toolkit}u_webview-%variant%psonum = %version %endif Requires: libwx_%{toolkit}u_xrc-%variant%psonum = %version -Requires: libwx_base-devel = %version +Requires: libwx_base-%variant-devel = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxWidgets-any-devel @@ -403,7 +403,7 @@ export VENDORTAG='-$variant' # only needed for non-MSW rm -fv "%buildroot/%_libdir"/libwx_baseu*.so* \ "%buildroot/%_libdir/wx/%wx_micro"/sound_sdlu-*.so %endif -rm -Rf %buildroot/%_datadir/locale +rm -Rfv %buildroot/%_datadir/locale # HACK: Fix wx-config symlink (bug introduced in 2.9.4). ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildroot/%_bindir/wx-config @@ -442,7 +442,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_%{toolkit}u_xrc-%variant%psonum -p /sbin/ldconfig %if %base_packages -%files -n libwx_base-devel +%files -n libwx_base-%variant-devel %_libdir/libwx_baseu*.so %files -n libwx_baseu-%variant%psonum @@ -518,6 +518,9 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %_datadir/bakefile %_includedir/wx-%wx_minor %_libdir/*.so +%if %base_packages +%exclude %_libdir/libwx_baseu* +%endif %dir %_libdir/wx %_libdir/wx/config %_libdir/wx/include