From d3920c3ddd83d9973016bcc0104d199fb3555142fec9c8290f58ef36c9b70400 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 Aug 2020 10:08:10 +0000 Subject: [PATCH] Accepting request 827959 from home:StefanBruens:branches:X11:wxWidgets submitted wrong revision ... OBS-URL: https://build.opensuse.org/request/show/827959 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=69 --- pre_checkin.sh | 4 ---- wxWidgets-3_2.spec | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 pre_checkin.sh diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index c146dc3..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -for i in GTK3 Qt; do - cp wxWidgets-3_2.changes "wx$i-3_2.changes" -done diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 224d095..82d698f 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -310,14 +310,23 @@ Requires: libwx_baseu_net-%variant%psonum = %version Requires: libwx_baseu_xml-%variant%psonum = %version Requires: pkgconfig(gl) Requires: pkgconfig(glu) - -Provides: wxGTK2-devel = %version-%release Provides: wxWidgets-any-devel -Provides: wxWidgets-devel = %version-%release Conflicts: wxWidgets-any-devel +%if %{toolkit} == "gtk2" +Provides: wxGTK2-devel = %version-%release +Provides: wxWidgets-devel = %version-%release # Name up to openSUSE 11.3 and up to wxGTK-2.8.x: Provides: wxGTK-devel = %version-%release Obsoletes: wxGTK-devel < %version-%release +%endif +%if %{toolkit} == "gtk3" +%if "%{flavor}" != "GTK3-nostl" +Provides: wxGTK3-devel = %version-%release +%endif +%endif +%if %{toolkit} == "qt" +Provides: wxQt-devel = %version-%release +%endif %description devel wxWidgets is a C++ library abstraction layer for a number of GUI