Sync with upstream master

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

.gitignore

@@ -7,3 +7,7 @@
 /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.18.11.tar.bz2
+/qgis-2.18.12.tar.bz2

qgis-2.18.12-pyobject-redefined.patch

@@ -0,0 +1,18 @@
+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,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.8
+Version:        2.18.12
 Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
@@ -42,12 +38,7 @@ Source5:        %{name}-mime.xml
 # https://hub.qgis.org/issues/15602
 # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
 Patch0:         %{name}-lib64.patch
-
-# Fix some SIP related FTBFS issues
-# upstream fix: qgsfiledownloader.sip:33:0: src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()'
-# 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
+Patch1:         %{name}-2.18.12-pyobject-redefined.patch
 
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
@@ -154,7 +145,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}
@@ -171,7 +167,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
@@ -193,8 +189,12 @@ Please refer to %{name}-server-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
-%if 0%{?fedora} >= 26
-%patch1 -p1 -b .sip
+
+%if 0%{?fedora} > 26
+# 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
 %endif
 
 # Remove executable permissions from source code files
@@ -230,7 +230,7 @@ gzip ChangeLog
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
-      %{configure_with_grass7} \
+      -D WITH_GRASS7:BOOL=TRUE \
       -D GRASS_PREFIX=%{_libdir}/grass \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
@@ -255,7 +255,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
@@ -348,9 +351,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
@@ -400,7 +403,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}/
@@ -418,6 +421,33 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Aug 28 2017 Daniele Viganò <daniele@vigano.me> - 2.18.12-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
+
+* 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
 

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/.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 @@
-SHA512 (qgis-2.18.8.tar.bz2) = ea6d3d6e95c186ced38f37f2da7e2fc43d337ce20c371cd1fa5160f816d42e8e59e87cd2efdc20db555d89970ca2ae1f0e089d616e0391efe6735fd3fec41ed4
+SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea