diff --git a/.gitignore b/.gitignore index 7a8dd79..2828482 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ 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.14.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 5d5f70f..b2ed2f5 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.12 +Version: 2.18.14 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -37,9 +37,7 @@ Source4: %{name}-server-README.fedora 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 -Patch1: %{name}-2.18.12-pyobject-redefined.patch # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: @@ -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 {} \+ @@ -420,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Tue Nov 07 2017 Volker Froehlich - 2.18.14-1 +- New upstream release + * Tue Aug 22 2017 Volker Froehlich - 2.18.12-1 - New upstream release - Add patch to solve SIP-4.19-related build failure diff --git a/sources b/sources index ef85b44..c1709a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea +SHA512 (qgis-2.18.14.tar.bz2) = da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036