From 976afdc45739db4e4580fdc0bbcf997e087f6ef3 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Jan 17 2018 13:07:15 +0000 Subject: fix some conditionals --- diff --git a/wxGTK3.spec b/wxGTK3.spec index 72b436f..142a75a 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -38,7 +38,7 @@ Source10: wx-config # Backport from wxGTK Patch0: %{name}-%{version}-abicheck.patch # Patch to port to webkit2gtk -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Patch1: %{name}-%{version}-webkit2.patch %endif # https://github.com/wxWidgets/wxWidgets/commit/ce1dce113c5eda42f49ba3278bb21c61872ca37d @@ -46,7 +46,7 @@ Patch2: %{name}-%{version}-avoid-tlw-destroy-assert.patch BuildRequires: gtk2-devel BuildRequires: gtk3-devel -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 BuildRequires: webkitgtk3-devel %else BuildRequires: webkit2gtk3-devel @@ -56,14 +56,14 @@ BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: expat-devel -%if 0%{?fedora} < 26 +%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 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 BuildRequires: gstreamer-plugins-base-devel %else BuildRequires: gstreamer1-plugins-base-devel @@ -121,7 +121,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 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 Requires: %{name}-webview = %{version}-%{release} %endif Requires: %{wxbasename} = %{version}-%{release} @@ -223,7 +223,7 @@ comprehensive set of helper classes for most common application tasks, ranging from networking to HTML display and image manipulation. -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %package webview Summary: WebView add-on for the wxWidgets library Group: System Environment/Libraries @@ -423,7 +423,7 @@ popd %post -n %{wxgtk2name}-media -p /sbin/ldconfig %postun -n %{wxgtk2name}-media -p /sbin/ldconfig -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %post webview -p /sbin/ldconfig %postun webview -p /sbin/ldconfig %endif @@ -458,7 +458,7 @@ fi %{_libdir}/libwx_gtk3u_ribbon-*.so.* %{_libdir}/libwx_gtk3u_richtext-*.so.* %{_libdir}/libwx_gtk3u_stc-*.so.* -%if 0%{?fedora} < 26 +%if 0%{?fedora} < 26 && 0%{?rhel} <= 7 %{_libdir}/libwx_gtk3u_webview-*.so.* %endif %{_libdir}/libwx_gtk3u_xrc-*.so.* @@ -518,7 +518,7 @@ fi %files -n %{wxgtk2name}-media %{_libdir}/libwx_gtk2u_media-*.so.* -%if 0%{?fedora} > 25 +%if 0%{?fedora} > 25 || 0%{?rhel} > 7 %files webview %{_libdir}/libwx_gtk3u_webview-*.so.* %dir %{_libdir}/wx @@ -539,6 +539,9 @@ fi %doc docs/doxygen/out/xml/* %changelog +* Wed Jan 17 2018 Karsten Hopp - 3.0.3-8 +- fix some conditionals + * Fri Jan 12 2018 Tomas Popela - 3.0.3-7 - Adapt to the webkitgtk4 rename