diff --git a/grass.spec b/grass.spec index 6989e9a..e12cdf8 100644 --- a/grass.spec +++ b/grass.spec @@ -7,7 +7,7 @@ Name: grass Version: 7.8.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?rhel} >= 7 @@ -77,11 +77,11 @@ BuildRequires: proj-epsg BuildRequires: proj-nad %endif %if 0%{?fedora} >= 30 -BuildRequires: proj-datumgrid-world +BuildRequires: proj-datumgrid-world %endif %if (0%{?rhel} <= 6 && !0%{?fedora}) # argparse is included in python2.7+ but not python2.6 -BuildRequires: python-argparse +BuildRequires: python-argparse %endif %if 0%{?rhel} == 7 # EPEL7 @@ -91,7 +91,7 @@ BuildRequires: python3-dateutil %endif BuildRequires: python3-devel %if (0%{?rhel} > 6 || 0%{?fedora}) -BuildRequires: python3-pillow +BuildRequires: python3-pillow %else # EPEL6 BuildRequires: python-imaging @@ -135,15 +135,10 @@ Requires: python%{python3_version_nodots}-dateutil %else Requires: python3-dateutil %endif -%if 0%{?rhel} < 7 -Requires: wxPython +%if 0%{?rhel} && 0%{?rhel} < 7 +Requires: wxPython %else -%if 0%{?rhel} > 6 -# https://bugzilla.redhat.com/show_bug.cgi?id=1765573 -#Requires: python%{python3_version_nodots}-wxpython4 -%else -Requires: python3-wxpython4 -%endif +Requires: python3-wxpython4 %endif %if "%{_lib}" == "lib" @@ -369,6 +364,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue May 26 2020 Markus Neteler - 7.8.3-5 +- fixed wxPython for F33 (BZ#1836761) + * Thu May 21 2020 Sandro Mani - 7.8.3-4 - Rebuild (gdal)