diff --git a/qgis-2.18.12-pyobject-redefined.patch b/qgis-2.18.12-pyobject-redefined.patch deleted file mode 100644 index dca2446..0000000 --- a/qgis-2.18.12-pyobject-redefined.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit 91171370514b558ea7f0ae34af7503ddb31d68e6 -Author: Juergen E. Fischer -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 - %End - diff --git a/qgis.spec b/qgis.spec index f308710..97ff613 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,7 +15,7 @@ Name: qgis Version: 2.18.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -38,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: @@ -190,13 +189,6 @@ Please refer to %{name}-server-README.fedora for details! %setup -q %patch0 -p1 -b .lib64 -%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 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -421,6 +413,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Sep 25 2017 Daniele ViganĂ² - 2.18.13-2 +- Remove SIP-4.19-related patch + * Mon Sep 25 2017 Daniele ViganĂ² - 2.18.13-1 - New upstream release