Merge branch 'saga' of dani/copr-dani-qgis into daniviga-2.18

Remove older patches from repo too

.gitignore

@@ -1,25 +1,11 @@
-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.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
+/qgis-2.18.7.tar.bz2
+/qgis-2.18.8.tar.bz2
+/qgis-2.18.9.tar.bz2
+/qgis-2.18.10.tar.bz2

qgis-2.12.0-arm.patch

@@ -1,13 +0,0 @@
-diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
-index 4a42a6d..5a4b975 100644
---- a/src/app/qgswelcomepageitemsmodel.cpp
-+++ b/src/app/qgswelcomepageitemsmodel.cpp
-@@ -114,7 +114,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem & option,
-                      index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) );
-   doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) );
- 
--  return QSize( width, qMax( doc.size().height() + 10, ( double )icon.height() ) + 20 );
-+  return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 );
- }
- 
- QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject* parent )

qgis-2.14.0-mssql-attributes.patch

@@ -1,43 +0,0 @@
-From 30449e577f0cd432bd8c60787743fba54c1e51b9 Mon Sep 17 00:00:00 2001
-From: Nyall Dawson <nyall.dawson@gmail.com>
-Date: Thu, 3 Mar 2016 10:34:32 +1100
-Subject: [PATCH] Fix fetching subset of attributes with mssql (fix #14402),
- add test
-
----
- src/providers/mssql/qgsmssqlfeatureiterator.cpp |  2 +-
- tests/src/python/providertestbase.py            | 11 +++++++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
-index 53214d4..560d344 100644
---- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp
-+++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
-@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
-     for ( int i = 0; i < mAttributesToFetch.count(); i++ )
-     {
-       QVariant v = mQuery->value( i );
--      const QgsField &fld = mSource->mFields.at( i );
-+      const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );
-       if ( v.type() != fld.type() )
-         v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );
-       feature.setAttribute( mAttributesToFetch.at( i ), v );
-diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
-index 7b8707e..26e6d86 100644
---- a/tests/src/python/providertestbase.py
-+++ b/tests/src/python/providertestbase.py
-@@ -384,3 +384,14 @@ def testClosedIterators(self):
- 
-         # Test rewinding closed iterator
-         self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed')
-+
-+    def testGetFeaturesSubsetAttributes(self):
-+        """ Test that expected results are returned when using subsets of attributes """
-+
-+        tests = {'pk': set([1, 2, 3, 4, 5]),
-+                 'cnt': set([-200, 300, 100, 200, 400]),
-+                 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]),
-+                 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])}
-+        for field, expected in tests.iteritems():
-+            result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))])
-+            self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result))

qgis-lib64.patch

@@ -0,0 +1,13 @@
+diff -up qgis-2.16.2/CMakeLists.txt.lib64 qgis-2.16.2/CMakeLists.txt
+diff -up qgis-2.16.2/cmake/PyQtMacros.cmake.lib64 qgis-2.16.2/cmake/PyQtMacros.cmake
+--- qgis-2.16.2/cmake/PyQtMacros.cmake.lib64	2016-08-26 05:58:37.000000000 -0600
++++ qgis-2.16.2/cmake/PyQtMacros.cmake	2016-09-21 16:25:55.921411011 -0600
+@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE(WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(WIN32)
+ 
+   FOREACH(it ${ARGN})

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

@@ -1,27 +1,33 @@
 #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
 
 # libspatialite is present for PPC and PPC64 in Fedora and EL7, but not in older EL
-%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
+%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE
 %if (0%{?rhel} <= 6 && !0%{?fedora})
 %ifarch ppc ppc64
-%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE -D WITH_INTERNAL_SPATIALITE:BOOL=FALSE
+%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=FALSE
 %endif
 %endif
 
-
-# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
-# the soname might stay the same, it won't work anymore.
-#http://hub.qgis.org/issues/5274
-%global grass_version 7.0.4
+%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.14.3
-Release:        3%{?dist}
+Version:        2.18.10
+Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -40,6 +46,15 @@ Source4:        %{name}-server-README.fedora
 # MIME definitions
 # Based on debian/qgis.xml but excluding already defined or proprietary types
 Source5:        %{name}-mime.xml
+# Fix builds on 64-bit machines
+# https://hub.qgis.org/issues/15602
+# 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:
@@ -56,7 +71,7 @@ BuildRequires:  fcgi-devel
 BuildRequires:  flex bison
 BuildRequires:  gdal-devel
 BuildRequires:  geos-devel
-BuildRequires:  grass-devel = %{grass_version}
+BuildRequires:  grass-devel
 BuildRequires:  gsl-devel
 
 %ifarch ppc ppc64
@@ -78,7 +93,9 @@ BuildRequires:  python2-devel
 # qca2 is a virtual provides of qca. Put here to make things easier for EPEL!
 BuildRequires:  qca2-devel
 BuildRequires:  qextserialport-devel
+BuildRequires:  qjson-devel
 BuildRequires:  qscintilla-devel
+BuildRequires:  qscintilla-python
 BuildRequires:  qscintilla-python-devel
 BuildRequires:  qt4-devel
 #BuildRequires:  qt-mobility-devel
@@ -97,6 +114,8 @@ BuildRequires:  sqlite-devel
 #BuildRequires:  xorg-x11-server-Xvfb
 
 Requires:       gpsbabel
+# As found in BZ#1396818
+Requires:       qca-ossl
 
 # We don't want to provide private Python extension libs
 %if (0%{?fedora} || 0%{?rhel} > 6)
@@ -134,7 +153,10 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 # The plug-in requires more than just the grass-libs.
 # This questions the sense of the libs package.
-Requires:       grass
+# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
+# the soname might stay the same, it won't work anymore.
+#http://hub.qgis.org/issues/5274
+Requires:       grass%{?_isa} = %{grass_version}
 
 %description grass
 GRASS plugin for QGIS required to interface with the GRASS system.
@@ -144,7 +166,7 @@ Summary:        Python integration and plug-ins for QGIS
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gdal-python
-Requires:       PyQt4
+Requires:       PyQt4-webkit
 Requires:       python-httplib2
 Requires:       python-jinja2
 Requires:       python-matplotlib
@@ -177,6 +199,10 @@ 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 {} \+
@@ -210,11 +236,9 @@ gzip ChangeLog
       -D QGIS_MANUAL_SUBDIR=/share/man \
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
-      -D MAPSERVER_SKIP_ECW=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
-      -D WITH_GRASS7:BOOL=TRUE \
+      %{configure_with_grass7} \
       -D GRASS_PREFIX=%{_libdir}/grass \
-      -D WITH_MAPSERVER:BOOL=TRUE \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D ENABLE_TESTS:BOOL=FALSE \
@@ -299,10 +323,6 @@ rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld
 # Remove install instructions
 rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL
 
-# Name of locale is wrong
-#mv %{buildroot}/usr/share/qgis/i18n/qgis_sr_Latn.qm \
-    #%{buildroot}/usr/share/qgis/i18n/qgis_sr@latin.qm
-
 %find_lang %{name} --with-qt
 
 
@@ -346,9 +366,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/%{name}/i18n/
 %lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
 %lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm
-%if 0%{?rhel}
-%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
-%endif
 %{_libdir}/lib%{name}_app.so.*
 %{_libdir}/lib%{name}_analysis.so.*
 %{_libdir}/lib%{name}_core.so.*
@@ -408,6 +425,75 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
+- Limit maximum number of concurrent make
+
+* 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
+
+* Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 2.18.9-1
+- New upstream release
+
+* Mon May 22 2017 Daniele Viganò <daniele@vigano.me> - 2.18.8-1
+- New upstream release
+
+* Wed Apr 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.7-1
+- New upstream release
+
+* 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
+
+* 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
+
+* Wed Mar 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.4-1
+- New upstream release
+
+* 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
+
+* Sat Nov 26 2016 Volker Froehlich <volker27@gmx.at> - 2.18.1-1
+- New upstream release
+
+* Sun Nov 20 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-2
+- Add qca-ossl to Requires, as of BZ#1396818
+
+* Fri Oct 21 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-1
+- New upstream release
+
+* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.3-1
+- Update to 2.16.3
+- Add patch to fix qreal usage on arm
+
+* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.2-1
+- Update to 2.16.2 (bug #1378240)
+- Add patch to fix build on 64-bit machines
+- Drop unused cmake options
+- Move %%grass_version macro to grass-devel, make it an install requirement
+
+* Mon Sep 26 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.14.3-6
+- rebuilt for matplotlib-2.0.0
+
+* Thu Aug 11 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-5
+- Replace dependency on PyQt4 with PyQt4-webkit, since webkit
+  is in a sub-package now (BZ #1360485)
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.14.3-4
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Tue Jun 07 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
 - Version bump to be newer than F24
 

qgis_sip-ftbfs.patch

@@ -0,0 +1,186 @@
+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/.gitignore

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

saga/saga.spec

@@ -0,0 +1,301 @@
+Name:           saga
+Version:        2.3.1
+Release:        1%{?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
+
+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 python
+Summary:        SAGA Python interface
+Group:          Applications/Engineering
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description python
+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}
+# 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 python
+%{python_sitearch}/*.py*
+%{python_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 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 @@
-8598c7bbe47d3b88c0df5524589d2cb0  qgis-2.14.3.tar.bz2
+SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8