Fix GRASS 7.4 path

See:
https://hub.qgis.org/issues/14651

.gitignore

@@ -1,33 +1,7 @@
-qgis_1.5.0.tar.gz
-/qgis_1.6.0.tar.gz
-/qgis-1.7.0.tar.bz2
-/qgis-1.7.1.tar.bz2
-/qgis-1.7.2.tar.bz2
-/qgis-1.7.3.tar.bz2
-/qgis-1.7.4.tar.bz2
-/qgis-1.8.0.tar.bz2
-/qgis-2.0.0.tar.bz2
-/qgis-2.0.1.tar.bz2
-/qgis-2.2.0.tar.bz2
-/qgis-2.4.0.tar.bz2
-/qgis-2.6.0.tar.bz2
-/qgis-2.6.1.tar.bz2
-/qgis-2.8.1.tar.bz2
-/qgis-2.8.2.tar.bz2
-/qgis-2.10.0.tar.bz2
-/qgis-2.10.1.tar.bz2
-/qgis-2.12.0.tar.bz2
-/qgis-2.12.1.tar.bz2
-/qgis-2.12.2.tar.bz2
-/qgis-2.12.3.tar.bz2
-/qgis-2.14.0.tar.bz2
-/qgis-2.14.1.tar.bz2
-/qgis-2.14.3.tar.bz2
-/qgis-2.16.2.tar.bz2
-/qgis-2.16.3.tar.bz2
 /qgis-2.18.0.tar.bz2
 /qgis-2.18.1.tar.bz2
 /qgis-2.18.2.tar.bz2
+/qgis-2.18.3.tar.bz2
 /qgis-2.18.4.tar.bz2
 /qgis-2.18.5.tar.bz2
 /qgis-2.18.6.tar.bz2
@@ -37,3 +11,7 @@ qgis_1.5.0.tar.gz
 /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-2.18.12-pyobject-redefined.patch

@@ -1,18 +0,0 @@
-commit 91171370514b558ea7f0ae34af7503ddb31d68e6
-Author: Juergen E. Fischer <jef@norbit.de>
-Date:   Sun Aug 20 10:51:52 2017 +0200
-
-    remove sip workaround (fixes #17038, refs #16071)
-
-diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
-index f9b7854..464952d 100644
---- a/python/core/qgscoordinatetransform.sip
-+++ b/python/core/qgscoordinatetransform.sip
-@@ -15,7 +15,6 @@
- class QgsCoordinateTransform : QObject
- {
- %TypeHeaderCode
--extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
- #include <qgscoordinatetransform.h>
- %End
- 

qgis-server-httpd.conf

@@ -2,7 +2,7 @@
 # It is not meant for productive use.
 
 RewriteEngine on
-RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
+RewriteRule ^/wms/(.*)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
 
 ScriptAlias /qgis/ "/usr/libexec/qgis/"
 

qgis.spec

@@ -11,12 +11,11 @@
 %endif
 %endif
 
-
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.12
-Release:        1%{?dist}
+Version:        2.18.16
+Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -39,7 +38,6 @@ Source5:        %{name}-mime.xml
 # https://hub.qgis.org/issues/15602
 # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
 Patch0:         %{name}-lib64.patch
-Patch1:         %{name}-2.18.12-pyobject-redefined.patch
 
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
@@ -71,7 +69,7 @@ BuildRequires:  postgresql-devel
 BuildRequires:  proj-devel
 BuildRequires:  PyQt4-devel
 # PyQwt doesn't support qwt6, so just turn it off for now on RHEL
-%if 0%{?fedora} < 26
+%if 0%{?fedora}
 BuildRequires:  PyQwt-devel
 %endif
 BuildRequires:  python2-devel
@@ -191,11 +189,6 @@ Please refer to %{name}-server-README.fedora for details!
 %setup -q
 %patch0 -p1 -b .lib64
 
-# Solve "error: conflicting declaration 'PyObject* sipExportedExceptions__core [3]'"
-# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6
-# https://issues.qgis.org/projects/qgis/repository/revisions/91171370514b558ea7f0ae34af7503ddb31d68e6/diff/python/core/qgscoordinatetransform.sip?format=diff
-%patch1 -p1 -b .pyobject
-
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
 
@@ -230,7 +223,7 @@ gzip ChangeLog
       -D WITH_BINDINGS:BOOL=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
       -D WITH_GRASS7:BOOL=TRUE \
-      -D GRASS_PREFIX=%{_libdir}/grass \
+      -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 \
@@ -420,79 +413,74 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
-* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
+* 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
 
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Jul 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.11-1
+* Tue Jul 25 2017 Daniele Viganò <daniele@vigano.me> - 2.18.11-1
 - New upstream release
 
-* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.18.10-7
-- Rebuild due to bug in RPM (RHBZ #1468476)
+* 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
 
-* Thu Jul 06 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.18.10-6
-- rebuild (sip)
+* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
+- Limit maximum number of concurrent make
 
-* Mon Jul 03 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-5
-- Bump release for NVR parity with F26
-
-* Thu Jun 29 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-4
-- Drop unnecessary qgis-2.18.10-sip.patch
-
-* Wed Jun 28 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-3
-- Add patch to fix sip issues
-
-* Mon Jun 26 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-2
-- Disable parallel build for now to avoid build failures
-
-* Sat Jun 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-1
+* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-1
+- Fix an issue in the QGIS server httpd configuration
 - New upstream release
 
-* Wed May 31 2017 Volker Froehlich <volker27@gmx.at> - 2.18.9-1
+* Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 2.18.9-1
 - New upstream release
 
-* Fri May 19 2017 Volker Froehlich <volker27@gmx.at> - 2.18.8-1
+* Mon May 22 2017 Daniele Viganò <daniele@vigano.me> - 2.18.8-1
 - New upstream release
 
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.18.7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sun Apr 23 2017 Volker Froehlich <volker27@gmx.at> - 2.18.7-1
+* Wed Apr 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.7-1
 - New upstream release
 
-* Fri Apr 07 2017 Volker Froehlich <volker27@gmx.at> - 2.18.6-1
+* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-2
+- Fix F26 builds
+
+* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-1
 - New upstream release
 
-* Sat Mar 25 2017 Volker Froehlich <volker27@gmx.at> - 2.18.5-1
+* Fri Apr 07 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-2
+- Build for F26
+
+* Mon Mar 27 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-1
 - New upstream release
 
 * Wed Mar 01 2017 Sandro Mani <manisandro@gmail.com> - 2.18.4-2
 - Add patch to fix FTBFS
 
-* Fri Feb 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.4-1
+* Wed Mar 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.4-1
 - New upstream release
 
-* Mon Feb 20 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.18.2-5
-- rebuild (qscintilla)
-
-* Tue Feb 14 2017 Volker Froehlich <volker27@gmx.at> - 2.18.2-4
-- Apply build patch for SIP 4.19 (#16071)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 2.18.2-2
-- rebuild (sip), disable PyQwt support (f26+, for now)
+* Wed Feb 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.3-1
+- New upstream release
 
 * Fri Dec 16 2016 Volker Froehlich <volker27@gmx.at> - 2.18.2-1
 - New upstream release

saga/.gitignore

@@ -0,0 +1 @@
+saga_2.3.1_gpl2.tar.gz

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

@@ -0,0 +1,320 @@
+Name:           saga
+Version:        2.3.1
+Release:        3%{?dist}
+Summary:        Geographic information system with an API for processing geodata 
+
+Group:          Applications/Engineering
+
+# libsaga_api is licensed under the terms of LGPLv2. So is one single
+# module and some of the code to create documentation.
+# The rest of the code is GPLv2, GPLv2+ or compatible (ISC, MIT/X11)
+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
+BuildRequires: libtool automake autoconf
+BuildRequires: e00compr-static
+BuildRequires: gdal-devel 
+BuildRequires: jasper-devel 
+BuildRequires: libharu-devel
+BuildRequires: libsvm-devel
+BuildRequires: libtiff-devel 
+BuildRequires: polyclipping-devel
+BuildRequires: proj-devel 
+BuildRequires: postgresql-devel 
+BuildRequires: python2-devel 
+BuildRequires: qhull-devel 
+BuildRequires: swig
+BuildRequires: unixODBC-devel 
+#BuildRequires: vigra-devel
+BuildRequires: wxGTK3-devel 
+
+%description
+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 -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 -n python2-saga
+Python interface for SAGA
+
+%package devel
+Summary:        SAGA development package
+Group:          Applications/Engineering
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package includes the headers and development libraries for SAGA.
+
+# We don't want to provide private Python extension libs
+# This approach only works with rpm 4.9
+# See https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage and https://fedorahosted.org/fpc/ticket/76
+#TODO: Check if provides are proper
+
+%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
+%global __provides_requires_from ^%{python_sitearch}/.*\.so$
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+
+# Convert to UNIX line-breaks
+sed -i 's/\r//' AUTHORS
+
+gzip -c ChangeLog > ChangeLog.gz
+
+%if 0%{?fedora} > 24
+# Installation directory has changed
+sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
+  src/modules/grid/grid_gridding/nn/delaunay.c
+%endif
+
+%build
+# wxGTK3 3.0.1-3 moved wx-config to libexecdir
+PATH=$PATH:%{_libexecdir}/wxGTK3/
+autoreconf -fi
+
+#TODO: openmp?
+# Build without non-free components
+%configure \
+    --disable-static \
+    --enable-python \
+    --disable-libfire \
+    --disable-triangle
+
+# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
+# -Wl,--as-needed after all the libraries.
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|^LTCC="gcc"|LTCC="gcc -Wl,--as-needed"|' \
+    -e 's|^CC="g++"|CC="g++ -Wl,--as-needed"|' \
+    -i libtool
+
+make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+# Drop libtool archives
+rm -rf %{buildroot}/%{_libdir}/saga/lib*.la     \
+     %{buildroot}/%{_libdir}/saga/libsaga_*.la
+rm -rf %{buildroot}/%{python_sitearch}/*.la     \
+     %{buildroot}/%{_libdir}/*.la
+
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
+
+
+%files
+%doc AUTHORS COPYING README
+%{_bindir}/%{name}_cmd
+%{_bindir}/%{name}_gui
+%{_libdir}/%{name}/
+%{_datadir}/%{name}/
+# No soname versioning is yet in place and the interfaces are not stable
+%{_libdir}/lib%{name}_api-%{version}.so
+%{_libdir}/lib%{name}_gdi-%{version}.so
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_mandir}/man1/%{name}_*1*
+
+%files -n python2-saga
+%{python2_sitearch}/*.py*
+%{python2_sitearch}/*.so
+
+%files devel
+%{_includedir}/%{name}/
+%{_libdir}/lib%{name}_api.so
+%{_libdir}/lib%{name}_gdi.so
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%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)
+
+* Tue Feb 21 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-3
+- Temporarily remove vigra support, due to build failure
+
+* Tue Jan 31 2017 Volker Froehlich <volker27@gmx.at> - 2.2.7-2
+- Rebuild for libproj
+
+* Fri Oct 14 2016 Volker Froehlich <volker27@gmx.at> - 2.2.7-1
+- New upstream release
+- Add new icons to file list
+- Add svm patch from Ubuntugis
+- Remove references to g2clib
+
+* Thu Oct 13 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-4
+- Rebuild for polyclipping 6.4
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-3
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.2.4-2
+- Rebuild for qhull-2015.2-1.
+- Reflect qhull_a.h's location having changed.
+
+* Sat Mar 12 2016 Volker Froehlich <volker27@gmx.at> - 2.2.4-1
+- New upstream release
+- Use the new build options to get rid of triangle, libfire and grib2c
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Oct 16 2015 Volker Froehlich <volker27@gmx.at> - 2.2.2-1
+- New upstream release
+
+* Fri Sep 25 2015 Volker Froehlich <volker27@gmx.at> - 2.2.1-1
+- New upstream release
+
+* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-2
+- Rebuild for GDAL 2.0
+
+* Sat Jul  4 2015 Volker Froehlich <volker27@gmx.at> - 2.2.0-1
+- New upstream version
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 2.1.4-4
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Thu Mar 26 2015 Orion Poplawski <orion@cora.nwra.com> - 2.1.4-3
+- Fix up removing bundled source
+
+* Sat Mar 14 2015 Volker Froehlich <volker27@gmx.at> - 2.1.4-2
+- Rebuild for Proj 4.1.9
+
+* Fri Nov 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.4-1
+- New upstream release
+- Update dxflib patch
+
+* Fri Oct 31 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.3-1
+- New upstream release
+- Remove ChangeLog, as it is not updated, ship README instead
+- Add and validate appdata file
+- Remove format patch (solved upstream)
+
+* Wed Oct 22 2014 Volker Froehlich <volker27@gmx.at> - 2.1.2-5
+- Rebuild for polyclipping 6.2.0
+
+* Tue Oct 14 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-4
+- Adapt package to new file layout in wxGTK3 3.0.1-3 (F22)
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 15 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.2-1
+- New upstream release
+
+* Thu Feb 13 2014 Volker Fröhlich <volker27@gmx.at> - 2.1.1-1
+- New upstream release
+- Compress changelog file
+- Adjust to using wxGTK3, thus drop propgrid dependency as it is included
+- Drop outdated build options
+- Adapt to polyclipping 6.1 API
+- Add BR for postgresql-devel
+- Drop custom desktop file and use png icon
+- Remove odbc headers from devel package, as discussed with Volker Wichmann
+- Add complementary requires-filtering
+
+* Sat Jan 18 2014 Volker Fröhlich <volker27@gmx.at> - 2.0.8-14
+- Use safe printing format, solve BZ #1037315 and upstream bug #163
+- Add patch for vigra 1.10.0 (upstream bug #173)
+
+* Tue Aug 27 2013 Orion Poplawski <orion@cora.nwra.com> - 2.0.8-13
+- Rebuild for gdal 1.10.0
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jun 24 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-11
+- Rebuild for polyclipping 5.1.6
+
+* Mon Mar  4 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-10
+- Rebuild for polyclipping 5.1.2
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Jan  8 2013 Volker Fröhlich <volker27@gmx.at> - 2.0.8-8
+- Rebuild for polyclipping
+
+* Wed Dec 26 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-7
+- Rebuild for polyclipping
+
+* Fri Nov 23 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-6
+- Rebuild for polyclipping
+
+* Fri Oct 19 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-5
+- Correct isa macros
+- No later versions of GPL and LGPL are allowed
+- Break down licenses
+- Solve the rpath issue differently
+- Rename patches and change numbering
+
+* Tue Oct  9 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-4
+- Remove draft patch breaking the build
+
+* Sun Oct  7 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-3
+- Replace provides-filtering with a suitable method
+- Replace dos2unix invocation with sed
+
+* Thu Apr 12 2012 Volker Fröhlich <volker27@gmx.at> - 2.0.8-2
+- Build with system-wide wxpropgrid and polyclipping
+- Correct Exec entry in the desktop file
+- Update patch for e00compr
+
+* Thu Nov 24 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.8-1
+- Updated for new version
+- Drop obsolete patches gcc46 and python-parallel
+- Correct tarball script
+- Update and correct linking in g2clib patch
+
+* Sun Oct 30 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-3
+- Delete dxflib from tarball
+- Split patches for dxflib and e00compr
+- Use bundled wxpropgrid for the time being
+- Use system-wide e00compr
+
+* Fri Oct 07 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-2
+- Correct g2clib patch to actually use g2clib
+- Only link to libraries actually used
+- Fix configure.in to really search for lodbc
+- Require g2clib-static instead of -devel
+
+* Fri Sep 09 2011 Volker Fröhlich <volker27@gmx.at> - 2.0.7-1
+- Initital package

saga/sources

@@ -0,0 +1 @@
+SHA512 (saga_2.3.1_gpl2.tar.gz) = 5036c6049e0d02b473f8c778aa44adfe769faa8504c3455f86e0b8d8f0ad831801fa2e5073eac786fbd1fc5a64157a0c8981fb551ab36136e2228cf0397d5079

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
+SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d