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

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-03-26 14:27:17 -0700 (Mon, 26 Mar 2018)
New Revision: 72579

Modified:
   grass/branches/releasebranch_7_4/rpm/grass.spec
Log:
rpm/grass.spec: update Python 2 dependency declarations to new Fedora packaging standards; from https://src.fedoraproject.org/rpms/grass/c/e275e6fe81625a781e0efed78f33a060fbadd18a?branch=pyambiguous)

Modified: grass/branches/releasebranch_7_4/rpm/grass.spec
===================================================================
--- grass/branches/releasebranch_7_4/rpm/grass.spec	2018-03-25 15:30:33 UTC (rev 72578)
+++ grass/branches/releasebranch_7_4/rpm/grass.spec	2018-03-26 21:27:17 UTC (rev 72579)
@@ -45,7 +45,7 @@
 %if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	netcdf-devel
 %endif
-BuildRequires:	numpy
+BuildRequires:	python2-numpy
 %if (0%{?rhel} > 6 || 0%{?fedora})
 BuildRequires:	postgresql-devel
 %else
@@ -59,13 +59,13 @@
 # argparse is included in python2.7+ but not python2.6
 BuildRequires:  python-argparse
 %endif
-BuildRequires:	python-dateutil
-BuildRequires:	python-devel
-Requires:  python-matplotlib
+BuildRequires:	python2-dateutil
+BuildRequires:	python2-devel
+Requires:  python2-matplotlib
 ##?
-#Requires:  python-matplotlib-wx
+#Requires:  python2-matplotlib-wx
 %if (0%{?rhel} > 6 || 0%{?fedora})
-BuildRequires:	python-pillow
+BuildRequires:	python2-pillow
 %else
 BuildRequires:	python-imaging
 %endif
@@ -77,10 +77,10 @@
 BuildRequires:	zlib-devel
 
 Requires:	geos
-Requires:	numpy
+Requires:	python2-numpy
 Requires:	proj-epsg
 Requires:	proj-nad
-Requires:	wxPython
+Requires:	python2-wxpython
 
 %if "%{_lib}" == "lib"
 %global cpuarch 32
@@ -312,7 +312,10 @@
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
-* Sun Jan 28 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-2
+* Mon Mar 26 2018 Markus Neteler <neteler at mundialis.de> - 7.4.1-2
+- Update Python 2 dependency declarations to new packaging standards
+  (author: Iryna Shcherbina <ishcherb at redhat.com> for 7.2.3-2)
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 - SPEC cleanup with fix of dependencies between packages (review #1539116)
 - appdata.xml file into '/usr/share/metainfo'
 - use icon cache scriplets only on EPEL