Fix GRASS 7.4 path

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>

.gitignore

@@ -9,3 +9,9 @@
 /qgis-2.18.8.tar.bz2
 /qgis-2.18.9.tar.bz2
 /qgis-2.18.10.tar.bz2
+/qgis-2.18.11.tar.bz2
+/qgis-2.18.12.tar.bz2
+/qgis-2.18.13.tar.bz2
+/qgis-2.18.14.tar.bz2
+/qgis-2.18.15.tar.bz2
+/qgis-2.18.16.tar.bz2

qgis.spec

@@ -1,13 +1,5 @@
 #TODO: Fix error message with processing plug-in in regards to pyspatialite
 
-# Limit the number of concurrent make to avoid failures due races:
-# qgsprojectionselector.h:14:10: fatal error: ui_qgsprojectionselectorbase.h: No such file or directory
-# #include <ui_qgsprojectionselectorbase.h>
-#          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-%if %(grep -c processor /proc/cpuinfo) > 4
-%_smp_mflags -j4
-%endif
-
 # Shared lib calls exit
 # https://hub.qgis.org/issues/2854
 
@@ -19,14 +11,10 @@
 %endif
 %endif
 
-%if 0%{?fedora} >= 24
-%global configure_with_grass7 -D WITH_GRASS7:BOOL=TRUE
-%endif
-
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.10
+Version:        2.18.16
 Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
@@ -51,11 +39,6 @@ Source5:        %{name}-mime.xml
 # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
 Patch0:         %{name}-lib64.patch
 
-# Fix some SIP related FTBFS issues
-# workaround (?): RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore
-# workaround (?): RuntimeError: qgis._core cannot import type 'QList<QPolygonF>' from PyQt4.QtCore
-Patch1:         qgis_sip-ftbfs.patch
-
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
 # http://code.google.com/p/pyspatialite/issues/detail?id=3
@@ -161,7 +144,12 @@ Requires:       grass%{?_isa} = %{grass_version}
 %description grass
 GRASS plugin for QGIS required to interface with the GRASS system.
 
-%package python
+%package -n python2-qgis
+%{?python_provide:%python_provide python2-qgis}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        Python integration and plug-ins for QGIS
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -178,7 +166,7 @@ Requires:       PyYAML
 Requires:       qscintilla-python
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
-%description python
+%description -n python2-qgis
 Python integration and plug-ins for QGIS.
 
 %package server
@@ -200,9 +188,6 @@ Please refer to %{name}-server-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
-%if 0%{?fedora} == 26
-%patch1 -p1 -b .sip
-%endif
 
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -237,8 +222,8 @@ gzip ChangeLog
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
-      %{configure_with_grass7} \
-      -D GRASS_PREFIX=%{_libdir}/grass \
+      -D WITH_GRASS7:BOOL=TRUE \
+      -D GRASS_PREFIX=%{_libdir}/grass-7.4.0 \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D ENABLE_TESTS:BOOL=FALSE \
@@ -262,7 +247,10 @@ gzip ChangeLog
       # Doesn't build, as of 2.10, known issue
       #-D WITH_GLOBE:BOOL=TRUE
 
-make %{?_smp_mflags}
+# Parallel build appears to occasionally result in build failures
+# (UI form headers generated too late)
+# TODO: Re-check with QGIS-3.0
+make
 
 
 %install
@@ -355,9 +343,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %postun grass -p /sbin/ldconfig
 
-%post python -p /sbin/ldconfig
+%post -n python2-qgis -p /sbin/ldconfig
 
-%postun python -p /sbin/ldconfig
+%postun -n python2-qgis -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
@@ -407,7 +395,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_libdir}/%{name}/grass/
 %{_datadir}/%{name}/grass/
 
-%files python
+%files -n python2-qgis
 %{_libdir}/libqgispython.so.*
 %{_datadir}/%{name}/python/
 %{python_sitearch}/%{name}/
@@ -425,6 +413,38 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Wed Jan 31 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-2
+- Rebuild for GRASS 7.4
+
+* Mon Jan 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-1
+- New upstream release
+
+* Sun Dec 10 2017 Daniele Viganò <daniele@vigano.me> - 2.18.15-1
+- New upstream release
+
+* Fri Oct 27 2017 Daniele Viganò <daniele@vigano.me> - 2.18.14-1
+- New upstream release
+
+* Mon Sep 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.13-2
+- Remove SIP-4.19-related patch
+
+* Mon Sep 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.13-1
+- New upstream release
+
+* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
+- Add patch to solve SIP-4.19-related build failure
+
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.18.11-4
+- Python 2 binary package renamed to python2-qgis
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+* Tue Jul 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.11-1
+- New upstream release
+
+* Mon Jul 17 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-6
+- Rebuild for F26 GA
+- Sync with Fedora upstream http://pkgs.fedoraproject.org/cgit/rpms/qgis.git
+
 * Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
 - Limit maximum number of concurrent make
 

qgis_sip-ftbfs.patch

@@ -1,186 +0,0 @@
-diff --git a/python/core/conversions.sip b/python/core/conversions.sip
-index f07d3ab1db..948821e91e 100644
---- a/python/core/conversions.sip
-+++ b/python/core/conversions.sip
-@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS
- register_from_qvariant_convertor(null_from_qvariant_convertor);
- %End
- %End
-+
-+// QList<QVariant> is implemented as a Python list.
-+%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+    // Create the list.
-+    PyObject *l;
-+
-+    if ((l = PyList_New(sipCpp->size())) == NULL)
-+        return NULL;
-+
-+    // Set the list elements.
-+    for (int i = 0; i < sipCpp->size(); ++i)
-+    {
-+        QVariant *t = new QVariant(sipCpp->at(i));
-+        PyObject *tobj;
-+
-+        if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL)
-+        {
-+            Py_DECREF(l);
-+            delete t;
-+
-+            return NULL;
-+        }
-+
-+        PyList_SET_ITEM(l, i, tobj);
-+    }
-+
-+    return l;
-+%End
-+
-+%ConvertToTypeCode
-+    SIP_SSIZE_T len;
-+
-+    // Check the type if that is all that is required.
-+    if (sipIsErr == NULL)
-+    {
-+        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+            return 0;
-+
-+        for (SIP_SSIZE_T i = 0; i < len; ++i)
-+        {
-+            PyObject *itm = PySequence_ITEM(sipPy, i);
-+            bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE));
-+
-+            Py_XDECREF(itm);
-+
-+            if (!ok)
-+                return 0;
-+        }
-+
-+        return 1;
-+    }
-+
-+    QList<QVariant> *ql = new QList<QVariant>;
-+    len = PySequence_Size(sipPy);
-+
-+    for (SIP_SSIZE_T i = 0; i < len; ++i)
-+    {
-+        PyObject *itm = PySequence_ITEM(sipPy, i);
-+        int state;
-+        QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
-+        Py_DECREF(itm);
-+
-+        if (*sipIsErr)
-+        {
-+            sipReleaseType(t, sipType_QVariant, state);
-+
-+            delete ql;
-+            return 0;
-+        }
-+
-+        ql->append(*t);
-+
-+        sipReleaseType(t, sipType_QVariant, state);
-+    }
-+
-+    *sipCppPtr = ql;
-+
-+    return sipGetState(sipTransferObj);
-+%End
-+};
-+
-+
-+// QList<QPolygonF> is implemented as a Python list.
-+%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+    // Create the list.
-+    PyObject *l;
-+
-+    if ((l = PyList_New(sipCpp->size())) == NULL)
-+        return NULL;
-+
-+    // Set the list elements.
-+    for (int i = 0; i < sipCpp->size(); ++i)
-+    {
-+        QPolygonF *t = new QPolygonF(sipCpp->at(i));
-+        PyObject *tobj;
-+
-+        if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL)
-+        {
-+            Py_DECREF(l);
-+            delete t;
-+
-+            return NULL;
-+        }
-+
-+        PyList_SET_ITEM(l, i, tobj);
-+    }
-+
-+    return l;
-+%End
-+
-+%ConvertToTypeCode
-+    SIP_SSIZE_T len;
-+
-+    // Check the type if that is all that is required.
-+    if (sipIsErr == NULL)
-+    {
-+        if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+            return 0;
-+
-+        for (SIP_SSIZE_T i = 0; i < len; ++i)
-+        {
-+            PyObject *itm = PySequence_ITEM(sipPy, i);
-+            bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE));
-+
-+            Py_XDECREF(itm);
-+
-+            if (!ok)
-+                return 0;
-+        }
-+
-+        return 1;
-+    }
-+
-+    QList<QPolygonF> *ql = new QList<QPolygonF>;
-+    len = PySequence_Size(sipPy);
-+
-+    for (SIP_SSIZE_T i = 0; i < len; ++i)
-+    {
-+        PyObject *itm = PySequence_ITEM(sipPy, i);
-+        int state;
-+        QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
-+        Py_DECREF(itm);
-+
-+        if (*sipIsErr)
-+        {
-+            sipReleaseType(t, sipType_QPolygonF, state);
-+
-+            delete ql;
-+            return 0;
-+        }
-+
-+        ql->append(*t);
-+
-+        sipReleaseType(t, sipType_QPolygonF, state);
-+    }
-+
-+    *sipCppPtr = ql;
-+
-+    return sipGetState(sipTransferObj);
-+%End
-+};
--- 
-2.12.0
-

saga/saga-projections-gcc6.patch

@@ -0,0 +1,135 @@
+From f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3 Mon Sep 17 00:00:00 2001
+Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3/
+From: oconrad <conrad@geowiss.uni-hamburg.de>
+Date: Thu, 18 Aug 2016 13:01:36 +0200
+Subject: saga_api, CSG_MetaData, gcc v6 compatibility: is_valid() function
+ removed (you can use () operator to check if a child entry with given name
+ exists)
+
+
+diff --git a/saga-gis/src/saga_core/saga_api/metadata.cpp b/saga-gis/src/saga_core/saga_api/metadata.cpp
+index 030be0c..4e2f135 100644
+--- a/src/saga_core/saga_api/metadata.cpp
++++ b/src/saga_core/saga_api/metadata.cpp
+@@ -174,17 +174,6 @@ void CSG_MetaData::Destroy(void)
+ ///////////////////////////////////////////////////////////
+ 
+ //---------------------------------------------------------
+-bool CSG_MetaData::is_Valid(void)	const
+-{
+-	return( this != NULL );
+-}
+-
+-
+-///////////////////////////////////////////////////////////
+-//														 //
+-///////////////////////////////////////////////////////////
+-
+-//---------------------------------------------------------
+ CSG_MetaData * CSG_MetaData::Add_Child(void)
+ {
+ 	return( Ins_Child(-1) );
+diff --git a/saga-gis/src/saga_core/saga_api/metadata.h b/saga-gis/src/saga_core/saga_api/metadata.h
+index 905a668..858be49 100644
+--- a/src/saga_core/saga_api/metadata.h
++++ b/src/saga_core/saga_api/metadata.h
+@@ -157,8 +157,6 @@ public:
+ 	const CSG_MetaData &		operator []			(int Index)					const	{	return( *Get_Child(Index           ) );	}
+ 	const CSG_MetaData &		operator []			(const CSG_String &Name)	const	{	return( *Get_Child(_Get_Child(Name)) );	}
+ 
+-	bool						is_Valid			(void)						const;
+-
+ 	int							Get_Property_Count	(void)						const	{	return( m_Prop_Names.Get_Count() );	}
+ 	const CSG_String &			Get_Property_Name	(int i)						const	{	return( m_Prop_Names [i] );			}
+ 	const SG_Char *				Get_Property		(int i)						const	{	return( i >= 0 && i < m_Prop_Values.Get_Count() ? m_Prop_Values[i].c_str() : NULL );	}
+diff --git a/saga-gis/src/saga_core/saga_api/projections.cpp b/saga-gis/src/saga_core/saga_api/projections.cpp
+index d84d386..638c0da 100644
+--- a/src/saga_core/saga_api/projections.cpp
++++ b/src/saga_core/saga_api/projections.cpp
+@@ -220,7 +220,7 @@ double				SG_Get_Projection_Unit_To_Meter		(TSG_Projection_Unit Unit)
+ //---------------------------------------------------------
+ bool				SG_Set_Projection_Unit		(const CSG_MetaData &m, TSG_Projection_Unit &Unit, CSG_String &Name, double &To_Meter)
+ {
+-	if( m["UNIT"].is_Valid() )
++	if( m("UNIT") )
+ 	{
+ 		if( m["UNIT"].Get_Property("name", Name) && (Unit = SG_Get_Projection_Unit(Name)) != SG_PROJ_UNIT_Undefined )
+ 		{
+@@ -1042,8 +1042,8 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 	// ]
+ 	if( !m.Get_Name().Cmp("GEOGCS") )
+ 	{
+-		if(	!m["DATUM"].is_Valid()
+-		||	!m["DATUM"]["SPHEROID"].is_Valid()
++		if(	!m("DATUM")
++		||	!m["DATUM"]("SPHEROID")
+ 		||	 m["DATUM"]["SPHEROID"].Get_Children_Count() != 2
+ 		||	!m["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
+ 		||	!m["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d <  0.0 )
+@@ -1056,7 +1056,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 		Proj4	+= CSG_String::Format(SG_T(" +a=%f"), a);						// Semimajor radius of the ellipsoid axis
+ 		Proj4	+= CSG_String::Format(SG_T(" +b=%f"), d > 0.0 ? a - a / d : a);	// Semiminor radius of the ellipsoid axis
+ 
+-		if(	m["DATUM"]["TOWGS84"].is_Valid() && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
++		if(	m["DATUM"]("TOWGS84") && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ 		{
+ 			for(i=0; i<7; i++)
+ 			{
+@@ -1064,7 +1064,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 			}
+ 		}
+ 
+-		if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
++		if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ 		{
+ 			Proj4	+= CSG_String::Format(SG_T(" +pm=%f"), d);
+ 		}
+@@ -1090,7 +1090,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 	// ]
+ 	if( !m.Get_Name().Cmp(SG_T("PROJCS")) )
+ 	{
+-		if( !m["PROJECTION"].is_Valid() )
++		if( !m("PROJECTION") )
+ 		{
+ 			SG_UI_Msg_Add_Error(CSG_String::Format(SG_T(">> WKT: %s"), _TL("no projection specified")));
+ 
+@@ -1104,9 +1104,9 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 			return( false );
+ 		}
+ 
+-		if(	!m["GEOGCS"].is_Valid()
+-		||	!m["GEOGCS"]["DATUM"].is_Valid()
+-		||	!m["GEOGCS"]["DATUM"]["SPHEROID"].is_Valid()
++		if(	!m("GEOGCS")
++		||	!m["GEOGCS"]("DATUM")
++		||	!m["GEOGCS"]["DATUM"]("SPHEROID")
+ 		||	 m["GEOGCS"]["DATUM"]["SPHEROID"].Get_Children_Count() != 2
+ 		||	!m["GEOGCS"]["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
+ 		||	!m["GEOGCS"]["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d <  0.0 )
+@@ -1121,7 +1121,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 		Proj4	+= CSG_String::Format(SG_T(" +a=%f"), a);
+ 		Proj4	+= CSG_String::Format(SG_T(" +b=%f"), d <= 0.0 ? a : a - a / d);	// Semiminor radius of the ellipsoid axis
+ 
+-		if(	m["GEOGCS"]["DATUM"]["TOWGS84"].is_Valid() && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
++		if(	m["GEOGCS"]["DATUM"]("TOWGS84") && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ 		{
+ 			for(i=0; i<7; i++)
+ 			{
+@@ -1129,7 +1129,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 			}
+ 		}
+ 
+-		if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
++		if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ 		{
+ 			Proj4	+= CSG_String::Format(SG_T(" +pm=%f"), d);
+ 		}
+@@ -1149,7 +1149,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ 			}
+ 		}
+ 
+-		if( m["UNIT"].is_Valid() && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
++		if( m("UNIT") && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
+ 		{
+ 			Proj4	+= CSG_String::Format(SG_T(" +to_meter=%f"), d);
+ 		}

saga/saga-spelling-errors.patch

@@ -0,0 +1,132 @@
+Description: Fix spelling errors.
+ * minium       -> minimum
+ * coodinate    -> coordinate
+ * contributers -> contributors
+ * ins't        -> isn't
+ * Internation  -> International
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://sourceforge.net/p/saga-gis/patches/15/
+Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/ed0361f4a2d25ac727cc184ceaca3125ef6c7dfe/
+                  https://sourceforge.net/p/saga-gis/code/ci/450e5927b0b0759d23b8b31258cc431e9d5aa844/
+
+--- a/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
++++ b/src/modules/grid/grid_filter/Filter_Multi_Dir_Lee.cpp
+@@ -190,7 +190,7 @@ CFilter_Multi_Dir_Lee::CFilter_Multi_Dir
+ 	Set_Author(_TL("Copyrights (c) 2003 by Andre Ringeler"));
+ 
+ 	Set_Description	(_TW(
+-		"The module searches for the minium variance within 16 directions "
++		"The module searches for the minimum variance within 16 directions "
+ 		"and applies a Lee Filter in the direction of minimum variance. The "
+ 		"filter is edge-preserving and can be used to remove speckle noise "
+ 		"from SAR images or to smooth DTMs. Applied to DTMs, this filter "
+--- a/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
++++ b/src/modules/terrain_analysis/ta_hydrology/Flow_RecursiveDown.cpp
+@@ -128,7 +128,7 @@ CFlow_RecursiveDown::CFlow_RecursiveDown
+ 
+ 	Parameters.Add_Value(
+ 		NULL	, "MINDQV"		, _TL("DEMON - Min. DQV"),
+-		_TL("DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"),
++		_TL("DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"),
+ 		PARAMETER_TYPE_Double	,	0.0, 0.0, true, 1.0, true
+ 	);
+ 
+--- a/src/saga_core/saga_gui/res/saga.bra.txt
++++ b/src/saga_core/saga_gui/res/saga.bra.txt
+@@ -1216,7 +1216,7 @@ TEXT	TRANSLATION
+ "DEM without Sinks"	"MDE sem skins"
+ "DEMON"	"DEMON"
+ "DEMON - Min. DQV"	"DEMON - Min. DQV"
+-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"	"DEMON - Volume m<>nimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
++"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"	"DEMON - Volume m<>nimo de drenagem do contigente (DQV) para tubos de fluxo rastreados"
+ "DESCRIPTION"	"Descri<72><69>o"
+ "DIFF_MEAN"	"DIFF_MEAN"
+ "DN"	"DN"
+--- a/src/saga_core/saga_gui/res/saga.ger.txt
++++ b/src/saga_core/saga_gui/res/saga.ger.txt
+@@ -1216,7 +1216,7 @@ TEXT	TRANSLATION
+ "DEM without Sinks"	""
+ "DEMON"	"DEMON"
+ "DEMON - Min. DQV"	""
+-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"	"DEMON - Minimales Abflussquotenvolumen (DQV) f<>r aufgezeichnete Flie<69>r<EFBFBD>hren"
++"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"	"DEMON - Minimales Abflussquotenvolumen (DQV) f<>r aufgezeichnete Flie<69>r<EFBFBD>hren"
+ "DESCRIPTION"	"BESCHREIBUNG"
+ "DIFF_MEAN"	"DIFFERENZ_DURCHSCHNITT"
+ "DN"	""
+--- a/src/saga_core/saga_gui/res/saga.lng.txt
++++ b/src/saga_core/saga_gui/res/saga.lng.txt
+@@ -1216,7 +1216,7 @@ TEXT	TRANSLATION
+ "DEM without Sinks"	""
+ "DEMON"	""
+ "DEMON - Min. DQV"	""
+-"DEMON - Minium Drainage Quota Volume (DQV) for traced flow tubes"	""
++"DEMON - Minimum Drainage Quota Volume (DQV) for traced flow tubes"	""
+ "DESCRIPTION"	""
+ "DIFF_MEAN"	""
+ "DN"	""
+--- a/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
++++ b/src/modules/projection/pj_proj4/crs_grid_geogcoords.cpp
+@@ -79,7 +79,7 @@ CCRS_Grid_GeogCoords::CCRS_Grid_GeogCoor
+ 	Set_Description	(_TW(
+ 		"Creates for a given grid geographic coordinate information, "
+ 		"i.e. two grids specifying the longitude and latitude for each cell. "
+-		"The coodinate system of the input grid has to be defined. "
++		"The coordinate system of the input grid has to be defined. "
+ 	));
+ 
+ 	Set_Description	(Get_Description() + "\n" + CSG_CRSProjector::Get_Description());
+--- a/src/saga_core/saga_cmd/man/saga_cmd.1
++++ b/src/saga_core/saga_cmd/man/saga_cmd.1
+@@ -221,7 +221,7 @@ Multiple input files can be specified by
+ On the website of \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
+ .SH "AUTHORS"
+ .IX Header "AUTHORS"
+-\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
++\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
+ Both are released under the \s-1GNU\s0 General Public License v2.
+ .PP
+ More info  \fIhttp://www.saga\-gis.org\fR
+--- a/src/saga_core/saga_gui/man/saga_gui.1
++++ b/src/saga_core/saga_gui/man/saga_gui.1
+@@ -142,7 +142,7 @@ Graphical user interface to the System f
+ On the project website: \fIhttp://www.saga\-gis.org\fR, a list of known bugs can be found and new bug reports can be submitted.
+ .SH "AUTHORS"
+ .IX Header "AUTHORS"
+-\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributers. This manual page was written by Johan Van de Wauw.
++\&\fB\s-1SAGA\s0\fR was written by Olaf Conrad with help from a large number of contributors. This manual page was written by Johan Van de Wauw.
+ Both are released under the \s-1GNU\s0 General Public License v2.
+ .PP
+ More info  \fIhttp://www.saga\-gis.org\fR
+--- a/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
++++ b/src/modules/pointcloud/pointcloud_tools/pc_reclass_extract.cpp
+@@ -91,7 +91,7 @@ CPC_Reclass_Extract::CPC_Reclass_Extract
+ 		"In addition to these settings, two special cases ('NoData values' and 'other values' not "
+ 		"included in the parameter setup) are supported:\n"
+ 		"In mode (a) and (b) the 'NoData option' is evaluated before the method settings, in mode "
+-		"(c) the option is evaluated only if the NoData value ins't included in the lookup table.\n"
++		"(c) the option is evaluated only if the NoData value isn't included in the lookup table.\n"
+ 		"The 'other values' option is always evaluated after checking the method settings.\n\n")
+ 	);
+ 
+--- a/src/saga_core/saga_api/projections.cpp
++++ b/src/saga_core/saga_api/projections.cpp
+@@ -1639,7 +1639,7 @@ bool CSG_Projections::_Set_Dictionary(CS
+ 		{	"hammer"	, " ", "Hammer_Eckert_Greifendorff"				, "*) Hammer & Eckert-Greifendorff"	},
+ 		{	"hatano"	, " ", "Hatano_Asymmetrical_Equal_Area"			, "*) Hatano Asymmetrical Equal Area"	},
+ 		{	"igh"		, " ", "World_Goode_Homolosine_Land"			, "*) Interrupted Goode Homolosine"	},
+-		{	"imw_p"		, " ", "Internation_Map_of_the_World_Polyconic"	, "*) Internation Map of the World Polyconic"	},
++		{	"imw_p"		, " ", "International_Map_of_the_World_Polyconic"	, "*) International Map of the World Polyconic"	},
+ 		{	"kav5"		, " ", "Kavraisky_V"							, "*) Kavraisky V"	},
+ 		{	"kav7"		, " ", "Kavraisky_VII"							, "*) Kavraisky VII"	},
+ 		{	"krovak"	, " ", "Krovak"									, "Krovak"	},
+--- a/src/saga_core/saga_gui/res/saga_dic.txt
++++ b/src/saga_core/saga_gui/res/saga_dic.txt
+@@ -50,7 +50,7 @@ PROJ4	DIR	WKT	DESC
+ "hammer"	" "	"Hammer_Eckert_Greifendorff"	"*) Hammer & Eckert-Greifendorff"
+ "hatano"	" "	"Hatano_Asymmetrical_Equal_Area"	"*) Hatano Asymmetrical Equal Area"
+ "igh"	" "	"Interrupted_Goodes_Homolosine"	"*) Interrupted Goode's Homolosine"
+-"imw_p"	" "	"Internation_Map_of_the_World_Polyconic"	"*) Internation Map of the World Polyconic"
++"imw_p"	" "	"International_Map_of_the_World_Polyconic"	"*) International Map of the World Polyconic"
+ "kav5"	" "	"Kavraisky_V"	"*) Kavraisky V"
+ "kav7"	" "	"Kavraisky_VII"	"*) Kavraisky VII"
+ "krovak"	" "	"Krovak"	"Krovak"

saga/saga.spec

@@ -1,6 +1,6 @@
 Name:           saga
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Geographic information system with an API for processing geodata 
 
 Group:          Applications/Engineering
@@ -12,6 +12,8 @@ License:        GPLv2 and LGPLv2
 URL:            http://www.saga-gis.org 
 #Source0:        https://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.3/SAGA%20%{version}/saga_%{version}_gpl2.tar.gz
 Source0:        %{name}_%{version}_gpl2.tar.gz
+Patch0:         %{name}-projections-gcc6.patch
+Patch1:         %{name}-spelling-errors.patch
 
 BuildRequires: libappstream-glib
 BuildRequires: desktop-file-utils
@@ -37,12 +39,17 @@ SAGA is a geographic information system (GIS) with a special API
 for geographic data processing. This API makes it easy to implement
 new algorithms. The SAGA API supports grid data, vector data, and tables. 
 
-%package python
+%package -n python2-saga
+%{?python_provide:%python_provide python2-saga}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        SAGA Python interface
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description python
+%description -n python2-saga
 Python interface for SAGA
 
 %package devel
@@ -63,6 +70,9 @@ This package includes the headers and development libraries for SAGA.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+
 # Convert to UNIX line-breaks
 sed -i 's/\r//' AUTHORS
 
@@ -126,9 +136,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_mandir}/man1/%{name}_*1*
 
-%files python
-%{python_sitearch}/*.py*
-%{python_sitearch}/*.so
+%files -n python2-saga
+%{python2_sitearch}/*.py*
+%{python2_sitearch}/*.so
 
 %files devel
 %{_includedir}/%{name}/
@@ -140,6 +150,15 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
 
 
 %changelog
+* Thu Jan 18 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-3
+- Add from Debian to address segfaults with shapefiles and newer GCC
+- Add a patch from Debian to fix spelling
+
+* Tue Aug 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-2
+- Sync with upstream master
+- Python 2 binary package renamed to python2-saga
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Jun 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-1
 - Update to SAGA 2.3.1 (with some non-free components disabled)
 

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8
+SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d