From f7735b9647b264006d43b630ecc0722f7ce2ab7a66ffd8286906c207b9e5faa1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 22 Nov 2017 18:51:40 +0000 Subject: [PATCH] Accepting request 534087 from home:KAMiKAZOW:Emulators Disable WebView for TW and upcoming Leap 15. OBS-URL: https://build.opensuse.org/request/show/534087 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=19 --- wxGTK3-3_2.changes | 5 +++++ wxGTK3-3_2.spec | 10 +++++++--- wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 14 +++++--------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index c289a1e..b414346 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org + +- Disable WebView for TW and upcoming Leap 15. + ------------------------------------------------------------------- Fri Jul 22 17:25:44 UTC 2016 - mailaender@opensuse.org diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index b5574d1..d23584e 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -65,7 +65,9 @@ BuildRequires: libtiff-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gtk+-3.0) +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(webkitgtk-3.0) +%endif %define gtk_version 3 %description @@ -150,7 +152,7 @@ Group: System/Libraries %description -n libwx_gtk%{gtk_version}u_stc-suse2 Library for the wxWidgets cross-platform GUI. -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 %package -n libwx_gtk%{gtk_version}u_webview-suse2 Summary: wxWidgets Library Group: System/Libraries @@ -185,7 +187,7 @@ Requires: libwx_gtk%{gtk_version}u_ribbon-suse2 = %version Requires: libwx_gtk%{gtk_version}u_richtext-suse2 = %version Requires: libwx_gtk%{gtk_version}u_stc-suse2 = %version Requires: pkgconfig(gl) -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 Requires: libwx_gtk%{gtk_version}u_webview-suse2 = %version %endif Requires: libwx_gtk%{gtk_version}u_xrc-suse2 = %version @@ -287,8 +289,10 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig %post -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig +%if 0%{?suse_version} < 1320 %post -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig +%endif %post -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_xrc-suse2 -p /sbin/ldconfig @@ -341,7 +345,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %defattr (-,root,root) %_libdir/libwx_gtk%{gtk_version}u_stc-suse.so.2* -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 %files -n libwx_gtk%{gtk_version}u_webview-suse2 %defattr (-,root,root) %_libdir/libwx_gtk%{gtk_version}u_webview-suse.so.2* diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index c289a1e..b414346 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 15 11:33:14 UTC 2017 - kamikazow@opensuse.org + +- Disable WebView for TW and upcoming Leap 15. + ------------------------------------------------------------------- Fri Jul 22 17:25:44 UTC 2016 - mailaender@opensuse.org diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index f730c46..b7cdda6 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -66,12 +66,8 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(webkit-1.0) -%else -%if 0%{?sles_version} == 0 -BuildRequires: libwebkit-gtk-devel -%endif %endif %description @@ -184,7 +180,7 @@ Group: System/Libraries %description -n libwx_gtk%{gtk_version}u_stc-suse2 Library for the wxWidgets cross-platform GUI. -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 %package -n libwx_gtk%{gtk_version}u_webview-suse2 Summary: wxWidgets Library Group: System/Libraries @@ -226,7 +222,7 @@ Requires: libwx_gtk%{gtk_version}u_ribbon-suse2 = %version Requires: libwx_gtk%{gtk_version}u_richtext-suse2 = %version Requires: libwx_gtk%{gtk_version}u_stc-suse2 = %version Requires: pkgconfig(gl) -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 Requires: libwx_gtk%{gtk_version}u_webview-suse2 = %version %endif Requires: libwx_gtk%{gtk_version}u_xrc-suse2 = %version @@ -337,7 +333,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %postun -n libwx_gtk%{gtk_version}u_richtext-suse2 -p /sbin/ldconfig %post -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_stc-suse2 -p /sbin/ldconfig -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 %post -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig %postun -n libwx_gtk%{gtk_version}u_webview-suse2 -p /sbin/ldconfig %endif @@ -405,7 +401,7 @@ ln -sf $(echo %buildroot/%_libdir/wx/config/* | sed "s%%%buildroot%%%%") %buildr %defattr (-,root,root) %_libdir/libwx_gtk%{gtk_version}u_stc-suse.so.2* -%if 0%{?suse_version} > 1110 +%if 0%{?suse_version} < 1320 %files -n libwx_gtk%{gtk_version}u_webview-suse2 %defattr (-,root,root) %_libdir/libwx_gtk%{gtk_version}u_webview-suse.so.2*