From 3f88bedf9f149b3060009ae1643697381c4cb2bf55a61b240fc523a30f28b5cc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Oct 2020 14:26:57 +0000 Subject: [PATCH 1/4] Accepting request 840442 from home:StefanBruens:branches:X11:wxWidgets - Fix unquoted bareword comparisons for RPM 4.16 compatibility OBS-URL: https://build.opensuse.org/request/show/840442 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=74 --- wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index c40135c..14998f0 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 9 13:48:14 UTC 2020 - Stefan Brüns + +- Fix unquoted bareword comparisons for RPM 4.16 compatibility + ------------------------------------------------------------------- Wed Sep 30 17:39:01 UTC 2020 - Stefan Brüns diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 149239d..ff321f4 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -104,17 +104,17 @@ BuildRequires: libnotify-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel -%if %{toolkit} == "gtk2" +%if "%{toolkit}" == "gtk2" BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel %endif -%if %{toolkit} == "gtk3" +%if "%{toolkit}" == "gtk3" BuildRequires: pkgconfig(gtk+-3.0) %if %{with webview} BuildRequires: pkgconfig(webkit2gtk-4.0) %endif %endif -%if %{toolkit} == "qt" +%if "%{toolkit}" == "qt" BuildRequires: pkgconfig(Qt5Core) >= 5.2.1 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.1 BuildRequires: pkgconfig(Qt5OpenGL) >= 5.2.1 @@ -288,13 +288,13 @@ SDL based sound plugin for the wxWidgets cross-platform GUI. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -%if %{toolkit} == "gtk2" +%if "%{toolkit}" == "gtk2" Requires: gtk2-devel %endif -%if %{toolkit} == "gtk3" +%if "%{toolkit}" == "gtk3" Requires: pkgconfig(gtk+-3.0) %endif -%if %{toolkit} == "qt" +%if "%{toolkit}" == "qt" Requires: pkgconfig(Qt5OpenGL) >= 5.2.1 Requires: pkgconfig(Qt5Widgets) >= 5.2.1 %endif @@ -320,19 +320,19 @@ Requires: pkgconfig(gl) Requires: pkgconfig(glu) Provides: wxWidgets-any-devel Conflicts: wxWidgets-any-devel -%if %{toolkit} == "gtk2" +%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 "%{toolkit}" == "gtk3" %if "%{flavor}" != "GTK3-nostl" Provides: wxGTK3-devel = %version-%release %endif %endif -%if %{toolkit} == "qt" +%if "%{toolkit}" == "qt" Provides: wxQt-devel = %version-%release %endif @@ -363,7 +363,7 @@ autoconf -f -i %configure \ --enable-vendor=%variant \ -%if %{toolkit} == "qt" +%if "%{toolkit}" == "qt" --with-qt \ %else --with-gtk=%gtk_version \ From 7cf8e36eb1e4941d50cbced9c2570c67b81432400dde9a74651dccf053d0f68c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Oct 2020 14:29:02 +0000 Subject: [PATCH 2/4] quote some more OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=75 --- wxWidgets-3_2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index ff321f4..27e00e9 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -367,7 +367,7 @@ autoconf -f -i --with-qt \ %else --with-gtk=%gtk_version \ -%if %{gtk_version} == 2 +%if "%gtk_version" == 2 --with-gnomevfs \ %endif %endif From be7731fbfa87ce68910c931aadd28c7ef81ce0c6698dc4180d72995bf90029c7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Oct 2020 16:40:42 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=76 --- wxWidgets-3_2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 27e00e9..e030e37 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -367,7 +367,7 @@ autoconf -f -i --with-qt \ %else --with-gtk=%gtk_version \ -%if "%gtk_version" == 2 +%if "%gtk_version" == "2" --with-gnomevfs \ %endif %endif From 29128a97180d91224ab24bcb698f5b14ffa58457d04d9c788a9e1d48719411a6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 9 Oct 2020 16:49:28 +0000 Subject: [PATCH 4/4] - Change wxGTK2 flavor to be the main (unnamed) flavor. OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=77 --- _multibuild | 1 - wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 6 +----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_multibuild b/_multibuild index 919de9d..eb2fa5c 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,4 @@ - GTK2 GTK3 GTK3-nostl Qt diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 14998f0..48d05fe 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 9 16:48:47 UTC 2020 - Jan Engelhardt + +- Change wxGTK2 flavor to be the main (unnamed) flavor. + ------------------------------------------------------------------- Fri Oct 9 13:48:14 UTC 2020 - Stefan Brüns diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index e030e37..e42d18a 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -18,11 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "" -Name: wxWidgets-3_2 -ExclusiveArch: do_not_build -%endif - -%if "%{flavor}" == "GTK2" +# default flavor is GTK2 Name: wxWidgets-3_2 %define pkgname wxWidgets-3_2 %define variant suse