[GRASS-SVN] r72938 - grass/branches/releasebranch_7_4/rpm

[svn_grass at osgeo.org]

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

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

Modified: grass/branches/releasebranch_7_4/rpm/grass.spec
===================================================================
--- grass/branches/releasebranch_7_4/rpm/grass.spec	2018-06-29 23:29:31 UTC (rev 72937)
+++ grass/branches/releasebranch_7_4/rpm/grass.spec	2018-06-29 23:29:51 UTC (rev 72938)
@@ -3,7 +3,7 @@
 
 Name:		grass
 Version:	7.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?rhel}
@@ -84,11 +84,16 @@
 BuildRequires:	zlib-devel
 
 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
@@ -328,6 +333,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