diff --git a/.gitignore b/.gitignore index d010631..d1d1ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 +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 904052c..7b16a68 100644 --- a/qgis.spec +++ b/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.11 +Version: 2.18.12 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -42,6 +38,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: @@ -148,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} @@ -165,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 @@ -188,6 +190,13 @@ 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 {} \+ @@ -221,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 \ @@ -342,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 @@ -394,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}/ @@ -412,6 +421,16 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Aug 28 2017 Daniele Viganò - 2.18.12-1 +- New upstream release + +* Tue Aug 22 2017 Volker Froehlich - 2.18.12-1 +- Add patch to solve SIP-4.19-related build failure + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.18.11-4 +- Python 2 binary package renamed to python2-qgis + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Tue Jul 25 2017 Daniele Viganò - 2.18.11-1 - New upstream release 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