From 466f350b03cfa0cd17f1fe1ddd7c473995422d51 Mon Sep 17 00:00:00 2001
From: Volker Froehlich <volker27@gmx.at>
Date: Wed, 23 Aug 2017 09:15:59 +0200
Subject: [PATCH] New version 2.18.12 and fix for SIP-4.19-related build
 failure

---
 .gitignore                            |  1 +
 qgis-2.18.12-pyobject-redefined.patch | 18 ++++++++++++++++++
 qgis.spec                             | 14 ++++++++++++--
 sources                               |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 qgis-2.18.12-pyobject-redefined.patch

diff --git a/.gitignore b/.gitignore
index a31c4ff..7a8dd79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ qgis_1.5.0.tar.gz
 /qgis-2.18.9.tar.bz2
 /qgis-2.18.10.tar.bz2
 /qgis-2.18.11.tar.bz2
+/qgis-2.18.12.tar.bz2
diff --git a/qgis-2.18.12-pyobject-redefined.patch b/qgis-2.18.12-pyobject-redefined.patch
new file mode 100644
index 0000000..dca2446
--- /dev/null
+++ b/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
+ 
diff --git a/qgis.spec b/qgis.spec
index 6f4e2bf..5d5f70f 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -15,8 +15,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.11
-Release:        4%{?dist}
+Version:        2.18.12
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -39,6 +39,7 @@ 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:
@@ -190,6 +191,11 @@ 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 {} \+
 
@@ -414,6 +420,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Tue Aug 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.12-1
+- New upstream release
+- 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
diff --git a/sources b/sources
index 8e724a5..ef85b44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qgis-2.18.11.tar.bz2) = 5100904912bbc9886e71cabfb70306e1e6a501d22da583df919211332b18f05cee5b5e3ca225976493ab03270d26d9de9e1050eeb140386df36c7e9f69f01ac0
+SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea