Fedora SPEC file: updated (#256)

Fedora SPEC file: updated to https://src.fedoraproject.org/rpms/grass

rpm/grass-7.8.0-buildroot.diff

@@ -0,0 +1,23 @@
+diff -up grass-7.8.0/include/Make/Install.make.sopwith grass-7.8.0/include/Make/Install.make
+--- grass-7.8.0/include/Make/Install.make.sopwith	2019-09-13 15:07:19.127928851 -0400
++++ grass-7.8.0/include/Make/Install.make	2019-09-13 15:25:55.583419717 -0400
+@@ -91,6 +91,10 @@ else
+ STARTUP = $(UNIX_BIN)/$(GRASS_NAME)
+ endif
+
++ifndef GISBASE_RUNTIME
++GISBASE_RUNTIME=$(INST_DIR)
++endif
++
+ FONTCAP = etc/fontcap
+ TMPGISRC = demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
+ PLATMAKE = include/Make/Platform.make
+@@ -125,7 +129,7 @@ $(INST_DIR) $(UNIX_BIN):
+ 	$(MAKE_DIR_CMD) $@
+
+ $(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
+-	sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
++	sed -e 's#'@GISBASE@'#'$(GISBASE_RUNTIME)'#g' \
+ 	    -e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
+ 	    -e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
+ 	    $< > $@

rpm/grass.spec

@@ -7,7 +7,7 @@
 
 Name:		grass
 Version:	7.9.0
-Release:	4%{?dist}
+Release:	1%{?dist}
 Summary:	GRASS GIS - Geographic Resources Analysis Support System
 
 %if 0%{?rhel}
@@ -17,7 +17,7 @@ URL:		https://grass.osgeo.org
 Source0:	https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
 Source2:	%{name}-config.h
 
-Patch1: grass-7.8.0-buildroot.patch
+Patch1:		grass-7.8.0-buildroot.diff
 
 BuildRequires:	bison
 BuildRequires:	blas-devel
@@ -50,7 +50,12 @@ BuildRequires:	mysql-devel
 BuildRequires:	netcdf-devel
 %endif
 BuildRequires:	python3
+%if 0%{?rhel} > 6
+# EPEL7
+BuildRequires:	python36-numpy
+%else
 BuildRequires:	python3-numpy
+%endif
 %if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:	postgresql-devel
 %else
@@ -68,11 +73,13 @@ BuildRequires:	proj-nad
 # argparse is included in python2.7+ but not python2.6
 BuildRequires:  python-argparse
 %endif
+%if 0%{?rhel} > 6
+# EPEL7
+BuildRequires:	python36-dateutil
+%else
 BuildRequires:	python3-dateutil
+%endif
 BuildRequires:	python3-devel
-Requires:	python3-matplotlib
-##?
-#Requires:  python3-matplotlib-wx
 %if (0%{?rhel} > 6 || 0%{?fedora})
 %if 0%{?rhel} > 6
 # EPEL7
@@ -92,9 +99,9 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	libzstd-devel
+
 Requires:	bzip2-libs
 Requires:	libzstd
-
 Requires:	geos
 %if (0%{?fedora} >= 30)
 Requires:	proj-datumgrid
@@ -104,14 +111,30 @@ Requires:	proj-epsg
 Requires:	proj-nad
 %endif
 Requires:	python3
+%if 0%{?rhel} > 6
+# EPEL7
+Requires:	python36-numpy
+%else
 Requires:	python3-numpy
+%endif
+%if 0%{?rhel} > 6
+# EPEL7
+#Requires:  python3-matplotlib-wx
+%else
+Requires:	python3-matplotlib
+%endif
+%if 0%{?rhel} > 6
+# EPEL7
+Requires:	python36-dateutil
+%else
+Requires:	python3-dateutil
+%endif
 %if 0%{?rhel}
 Requires:	wxPython
 %else
 Requires:	python3-wxpython4
 %endif
 
-
 %if "%{_lib}" == "lib"
 %global cpuarch 32
 %else
@@ -331,6 +354,16 @@ fi
 %{_libdir}/%{name}%{shortver}/include
 
 %changelog
+* Thu Dec 12 2019 Markus Neteler <neteler@mundialis.de> - 7.8.2
+- new upstream version GRASS GIS 7.8.2
+
+* Thu Oct 24 2019 Markus Neteler <neteler@mundialis.de> - 7.8.1
+- new upstream version GRASS GIS 7.8.1
+- it supports GDAL 3 and PROJ 6
+
+* Thu Oct 24 2019 Markus Neteler <neteler@mundialis.de> - 7.8.0-5
+- fix EPEL7 support
+
 * Mon Sep 23 2019 Markus Metz <metz@mundialis.de> - 7.8.0-4
 - enable bzip2 compression