Hello community, here is the log from the commit of package qgis for openSUSE:Factory checked in at 2019-11-15 00:12:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgis (Old) and /work/SRC/openSUSE:Factory/.qgis.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgis" Fri Nov 15 00:12:58 2019 rev:3 rq:748573 version:3.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qgis/qgis.changes 2019-11-08 15:27:04.107080299 +0100 +++ /work/SRC/openSUSE:Factory/.qgis.new.26869/qgis.changes 2019-11-15 00:13:04.040101212 +0100 @@ -1,0 +2,16 @@ +Wed Nov 13 11:59:22 UTC 2019 - Libor Pechacek <[email protected]> + +- Fix upstream issue 32764 preventing parallel build and remove the build time + workaround. +- Added patches: + a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch + +------------------------------------------------------------------- +Thu Nov 7 18:35:16 UTC 2019 - Libor Pechacek <[email protected]> + +- Update to 3.10.0, changes are documented at + http://changelog.qgis.org/en/qgis/version/3.10/ +- Removed patches: + ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch (merged upstream) + +------------------------------------------------------------------- Old: ---- ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch qgis-3.8.3.tar.bz2 qgis-3.8.3.tar.bz2.md5 New: ---- a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch qgis-3.10.0.tar.bz2 qgis-3.10.0.tar.bz2.sha256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgis.spec ++++++ --- /var/tmp/diff_new_pack.UE5Rz1/_old 2019-11-15 00:13:09.636099216 +0100 +++ /var/tmp/diff_new_pack.UE5Rz1/_new 2019-11-15 00:13:09.640099214 +0100 @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %bcond_without grass %bcond_with otb Name: qgis -Version: 3.8.3 +Version: 3.10.0 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only Group: Productivity/Graphics/Visualization/Other URL: https://qgis.org/ Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2 -Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5 +Source1: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.sha256 Source2: %{name}.rpmlintrc Source3: qgis_sample_data.zip # Headers in Qt5.11 were cleaned up to no longer include unneeded other headers. Patch0: fix_grass_qt511.patch -# PATCH-FIX-UPSTREAM Missing include https://github.com/qgis/QGIS/issues/30316 -Patch1: ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch # PATCH-FIX-UPSTREAM fix randomness in desktop file translations Patch2: qgis-3.8.3-reproducible.patch +Patch3: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 BuildRequires: cmake >= 3.0.0 @@ -45,10 +45,10 @@ %if %{with grass} BuildRequires: grass-devel >= 7.2 %endif -BuildRequires: libexiv2-devel BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libQt5Sql5-mysql BuildRequires: libQt5Sql5-postgresql +BuildRequires: libexiv2-devel # Add the 3 main db we should access # also have them in requires BuildRequires: libQt5Sql5-sqlite @@ -62,11 +62,11 @@ BuildRequires: pkgconfig BuildRequires: poppler-tools BuildRequires: python-qscintilla-qt5-sip +BuildRequires: python3-GDAL BuildRequires: python3-Jinja2 BuildRequires: python3-OWSLib BuildRequires: python3-PyYAML BuildRequires: python3-future -BuildRequires: python3-GDAL BuildRequires: python3-psycopg2 BuildRequires: python3-pygments BuildRequires: python3-qscintilla-qt5 @@ -127,12 +127,12 @@ Requires: libQt5Sql5-postgresql # Force requires of those 3 main component. Requires: libQt5Sql5-sqlite +Requires: python3-GDAL Requires: python3-Jinja2 Requires: python3-OWSLib Requires: python3-PyYAML Requires: python3-Pygments Requires: python3-future -Requires: python3-GDAL Requires: python3-psycopg2 # Those are not picked by obs Requires: python3-qscintilla-qt5 @@ -187,8 +187,8 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 +%patch3 -p1 # Remove bad env and python version in grass plugin sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py sed -i 's,^#!%{_bindir}/env python3$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py ++++++ a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch ++++++ >From a07d915d7bf9c7c54b2047f8819ba2aae6669f35 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn <[email protected]> Date: Wed, 13 Nov 2019 10:27:06 +0100 Subject: [PATCH] Add missing dep Fix #32764 Acked-by: Libor Pechacek <[email protected]> --- src/providers/wms/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt index 60dc3448db37..22c71d1b2eab 100644 --- a/src/providers/wms/CMakeLists.txt +++ b/src/providers/wms/CMakeLists.txt @@ -68,6 +68,7 @@ IF (WITH_GUI) ) TARGET_COMPILE_DEFINITIONS(wmsprovider_gui_a PRIVATE "-DQT_NO_FOREACH") ADD_DEPENDENCIES(wmsprovider_gui_a ui) + ADD_DEPENDENCIES(wmsprovider_a ui) ENDIF (WITH_GUI) IF (FORCE_STATIC_PROVIDERS) ++++++ qgis-3.8.3.tar.bz2 -> qgis-3.10.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/qgis/qgis-3.8.3.tar.bz2 /work/SRC/openSUSE:Factory/.qgis.new.26869/qgis-3.10.0.tar.bz2 differ: char 11, line 1 ++++++ qgis-3.10.0.tar.bz2.sha256 ++++++ 25eb1c41d9fb922ffa337a720dfdceee43cf2d38409923f087c2010c9742f012 qgis-3.10.0.tar.bz2
