[GRASS-SVN] r72937 - grass/trunk/rpm

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-06-29 16:29:31 -0700 (Fri, 29 Jun 2018)
New Revision: 72937

Modified:
   grass/trunk/rpm/grass.spec
Log:
Fedora RPM SPEC: fix wxPython package dependency name for CentOS7

Modified: grass/trunk/rpm/grass.spec
===================================================================
--- grass/trunk/rpm/grass.spec	2018-06-29 23:12:23 UTC (rev 72936)
+++ grass/trunk/rpm/grass.spec	2018-06-29 23:29:31 UTC (rev 72937)
@@ -86,11 +86,16 @@
 Requires:	libzstd
 
 Requires:	geos
-Requires:	python2-numpy
 Requires:	proj-epsg
 Requires:	proj-nad
+Requires:	python2-numpy
+%if 0%{?rhel}
+Requires:	wxPython
+%else
 Requires:	python2-wxpython
+%endif
 
+
 %if "%{_lib}" == "lib"
 %global cpuarch 32
 %else
@@ -331,6 +336,9 @@
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Sat Jun 23 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-2
+- fix wxPython package dependency name for CentOS7
+
 * Tue Jun 12 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-1
 - new upstream version 7.4.1
 - do not fail on EPEL6 with appstream-util