1
0
forked from pool/wxWidgets-3_2

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
This commit is contained in:
Jan Engelhardt 2020-10-09 14:26:57 +00:00 committed by Git OBS Bridge
parent 8898072da1
commit 3f88bedf9f
2 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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> Wed Sep 30 17:39:01 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -104,17 +104,17 @@ BuildRequires: libnotify-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %{toolkit} == "gtk2" %if "%{toolkit}" == "gtk2"
BuildRequires: gnome-vfs2-devel BuildRequires: gnome-vfs2-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
%endif %endif
%if %{toolkit} == "gtk3" %if "%{toolkit}" == "gtk3"
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
%if %{with webview} %if %{with webview}
BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(webkit2gtk-4.0)
%endif %endif
%endif %endif
%if %{toolkit} == "qt" %if "%{toolkit}" == "qt"
BuildRequires: pkgconfig(Qt5Core) >= 5.2.1 BuildRequires: pkgconfig(Qt5Core) >= 5.2.1
BuildRequires: pkgconfig(Qt5Gui) >= 5.2.1 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.1
BuildRequires: pkgconfig(Qt5OpenGL) >= 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 %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%if %{toolkit} == "gtk2" %if "%{toolkit}" == "gtk2"
Requires: gtk2-devel Requires: gtk2-devel
%endif %endif
%if %{toolkit} == "gtk3" %if "%{toolkit}" == "gtk3"
Requires: pkgconfig(gtk+-3.0) Requires: pkgconfig(gtk+-3.0)
%endif %endif
%if %{toolkit} == "qt" %if "%{toolkit}" == "qt"
Requires: pkgconfig(Qt5OpenGL) >= 5.2.1 Requires: pkgconfig(Qt5OpenGL) >= 5.2.1
Requires: pkgconfig(Qt5Widgets) >= 5.2.1 Requires: pkgconfig(Qt5Widgets) >= 5.2.1
%endif %endif
@ -320,19 +320,19 @@ Requires: pkgconfig(gl)
Requires: pkgconfig(glu) Requires: pkgconfig(glu)
Provides: wxWidgets-any-devel Provides: wxWidgets-any-devel
Conflicts: wxWidgets-any-devel Conflicts: wxWidgets-any-devel
%if %{toolkit} == "gtk2" %if "%{toolkit}" == "gtk2"
Provides: wxGTK2-devel = %version-%release Provides: wxGTK2-devel = %version-%release
Provides: wxWidgets-devel = %version-%release Provides: wxWidgets-devel = %version-%release
# Name up to openSUSE 11.3 and up to wxGTK-2.8.x: # Name up to openSUSE 11.3 and up to wxGTK-2.8.x:
Provides: wxGTK-devel = %version-%release Provides: wxGTK-devel = %version-%release
Obsoletes: wxGTK-devel < %version-%release Obsoletes: wxGTK-devel < %version-%release
%endif %endif
%if %{toolkit} == "gtk3" %if "%{toolkit}" == "gtk3"
%if "%{flavor}" != "GTK3-nostl" %if "%{flavor}" != "GTK3-nostl"
Provides: wxGTK3-devel = %version-%release Provides: wxGTK3-devel = %version-%release
%endif %endif
%endif %endif
%if %{toolkit} == "qt" %if "%{toolkit}" == "qt"
Provides: wxQt-devel = %version-%release Provides: wxQt-devel = %version-%release
%endif %endif
@ -363,7 +363,7 @@ autoconf -f -i
%configure \ %configure \
--enable-vendor=%variant \ --enable-vendor=%variant \
%if %{toolkit} == "qt" %if "%{toolkit}" == "qt"
--with-qt \ --with-qt \
%else %else
--with-gtk=%gtk_version \ --with-gtk=%gtk_version \