.gitignore

@@ -35,5 +35,3 @@ qgis_1.5.0.tar.gz
 /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

@@ -1,18 +0,0 @@
-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.spec

@@ -15,8 +15,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.12
+Version:        2.18.10
-Release:        1%{?dist}
+Release:        7%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -39,7 +39,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:
@@ -146,12 +145,7 @@ Requires:       grass%{?_isa} = %{grass_version}
 %description grass
 GRASS plugin for QGIS required to interface with the GRASS system.
 
-%package -n python2-qgis
+%package python
-%{?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}
@@ -168,7 +162,7 @@ Requires:       PyYAML
 Requires:       qscintilla-python
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 
-%description -n python2-qgis
+%description python
 Python integration and plug-ins for QGIS.
 
 %package server
@@ -191,11 +185,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 {} \+
 
@@ -350,9 +339,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %postun grass -p /sbin/ldconfig
 
-%post -n python2-qgis -p /sbin/ldconfig
+%post python -p /sbin/ldconfig
 
-%postun -n python2-qgis -p /sbin/ldconfig
+%postun python -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
@@ -402,7 +391,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_libdir}/%{name}/grass/
 %{_datadir}/%{name}/grass/
 
-%files -n python2-qgis
+%files python
 %{_libdir}/libqgispython.so.*
 %{_datadir}/%{name}/python/
 %{python_sitearch}/%{name}/
@@ -420,23 +409,6 @@ 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
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Jul 22 2017 Volker Froehlich <volker27@gmx.at> - 2.18.11-1
-- New upstream release
-
 * Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 2.18.10-7
 - Rebuild due to bug in RPM (RHBZ #1468476)
 

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.12.tar.bz2) = e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
+SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8