qzhao/wxWidgets-3_2
SHA256
1
0
Fork 0
forked from jengelh/wxWidgets-3_2
Code Pull Requests Activity

Accepting request 841336 from X11:wxWidgets

Browse Source 
- Change wxGTK2 flavor to be the main (unnamed) flavor.
- Fix unquoted bareword comparisons for RPM 4.16 compatibility

OBS-URL: https://build.opensuse.org/request/show/841336
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wxWidgets-3_2?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2020-10-15 11:44:08 +00:00 committed by Git OBS Bridge
commit 91a2301b2a
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_multibuild
View File

@ -1,5 +1,4 @@
<multibuild>
<package>GTK2</package>
<package>GTK3</package>
<package>GTK3-nostl</package>
<package>Qt</package>

10
wxWidgets-3_2.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Oct 9 16:48:47 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Change wxGTK2 flavor to be the main (unnamed) flavor.
-------------------------------------------------------------------
Fri Oct 9 13:48:14 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix unquoted bareword comparisons for RPM 4.16 compatibility
-------------------------------------------------------------------
Wed Sep 30 17:39:01 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

28
wxWidgets-3_2.spec
View File

@ -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
@ -104,17 +100,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 +284,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 +316,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,11 +359,11 @@ autoconf -f -i
%configure \
--enable-vendor=%variant \
%if %{toolkit} == "qt"
%if "%{toolkit}" == "qt"
--with-qt \
%else
--with-gtk=%gtk_version \
%if %{gtk_version} == 2
%if "%gtk_version" == "2"
--with-gnomevfs \
%endif
%endif