From 35d1c2fde37ae623f04818f7d1a8f1e6ffd7e2ee Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jan 17 2018 16:31:48 +0000 Subject: F25 is EOL Also half of conditions were totally wrong. Signed-off-by: Igor Gnatenko --- diff --git a/wxGTK3.spec b/wxGTK3.spec index ae7897a..c51acba 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -44,28 +44,16 @@ Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch BuildRequires: gtk2-devel BuildRequires: gtk3-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: webkitgtk3-devel -%else BuildRequires: webkit2gtk3-devel -%endif BuildRequires: zlib-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: expat-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: SDL-devel -%else BuildRequires: SDL2-devel -%endif BuildRequires: libGLU-devel BuildRequires: libSM-devel -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -BuildRequires: gstreamer-plugins-base-devel -%else BuildRequires: gstreamer1-plugins-base-devel -%endif BuildRequires: GConf2-devel BuildRequires: gettext BuildRequires: cppunit-devel @@ -119,9 +107,7 @@ Summary: Development files for the wxGTK3 library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-gl = %{version}-%{release} Requires: %{name}-media = %{version}-%{release} -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Requires: %{name}-webview = %{version}-%{release} -%endif Requires: %{wxbasename} = %{version}-%{release} Requires: %{wxbasename}-devel%{?_isa} = %{version}-%{release} Requires: gtk3-devel @@ -221,7 +207,6 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %package webview Summary: WebView add-on for the wxWidgets library Group: System Environment/Libraries @@ -233,7 +218,6 @@ wxWidgets is the GTK port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%endif %package -n %{wxbasename} @@ -421,10 +405,8 @@ popd %post -n %{wxgtk2name}-media -p /sbin/ldconfig %postun -n %{wxgtk2name}-media -p /sbin/ldconfig -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %post webview -p /sbin/ldconfig %postun webview -p /sbin/ldconfig -%endif %post -n %{wxbasename} -p /sbin/ldconfig %postun -n %{wxbasename} -p /sbin/ldconfig @@ -456,9 +438,6 @@ fi %{_libdir}/libwx_gtk3u_ribbon-*.so.* %{_libdir}/libwx_gtk3u_richtext-*.so.* %{_libdir}/libwx_gtk3u_stc-*.so.* -%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 -%{_libdir}/libwx_gtk3u_webview-*.so.* -%endif %{_libdir}/libwx_gtk3u_xrc-*.so.* %files -n %{wxgtk2name} @@ -516,12 +495,10 @@ fi %files -n %{wxgtk2name}-media %{_libdir}/libwx_gtk2u_media-*.so.* -%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %files webview %{_libdir}/libwx_gtk3u_webview-*.so.* %dir %{_libdir}/wx %{_libdir}/wx/3.0 -%endif %files -n %{wxbasename} %doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt