Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qgis for openSUSE:Factory checked in at 2021-03-05 13:46:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgis (Old) and /work/SRC/openSUSE:Factory/.qgis.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgis" Fri Mar 5 13:46:33 2021 rev:19 rq:875975 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qgis/qgis.changes 2020-12-15 12:33:23.764145902 +0100 +++ /work/SRC/openSUSE:Factory/.qgis.new.2378/qgis.changes 2021-03-05 13:49:27.807850563 +0100 @@ -1,0 +2,23 @@ +Wed Feb 24 13:41:32 UTC 2021 - Guillaume GARDET <[email protected]> + +- Update to 3.18.0: + * Changelog: https://www.qgis.org/en/site/forusers/visualchangelog318/index.html +- Drop upstreamed patch: + * qgis-fix-return.patch +- Fix fastcgi include: + * fix-fastcgi-include.patch + +------------------------------------------------------------------- +Wed Feb 24 13:13:01 UTC 2021 - Guillaume GARDET <[email protected]> + +- Update to 3.16.4 +- Update spec file to ease future move from qgis to qgis-ltr + +------------------------------------------------------------------- +Thu Jan 21 10:03:29 UTC 2021 - Guillaume GARDET <[email protected]> + +- Update to 3.16.3 +- Drop upstream patch: + * qgis-pr37842-sip5.patch + +------------------------------------------------------------------- Old: ---- qgis-3.14.16.tar.bz2 qgis-3.14.16.tar.bz2.sha256 qgis-pr37842-sip5.patch New: ---- fix-fastcgi-include.patch qgis-3.18.0.tar.bz2 qgis-3.18.0.tar.bz2.sha256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgis.spec ++++++ --- /var/tmp/diff_new_pack.r82KOQ/_old 2021-03-05 13:49:30.003852560 +0100 +++ /var/tmp/diff_new_pack.r82KOQ/_new 2021-03-05 13:49:30.007852563 +0100 @@ -1,7 +1,7 @@ # -# spec file for package qgis +# spec file for package qgis-ltr # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,25 @@ # +%define is_ltr 0 + %bcond_without grass +%if %is_ltr +Name: qgis-ltr +%else Name: qgis -Version: 3.14.16 +%endif +Version: 3.18.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.sha256 +Source: https://qgis.org/downloads/qgis-%{version}.tar.bz2 +Source1: https://qgis.org/downloads/qgis-%{version}.tar.bz2.sha256 Source2: %{name}.rpmlintrc Source3: qgis_sample_data.zip -# PATCH-FIX-UPSTREAM https://github.com/qgis/QGIS/pull/37842 Get rid of SIP deprecated functions (support sip5) -Patch0: https://github.com/qgis/QGIS/pull/37842.patch#/qgis-pr37842-sip5.patch +Patch1: fix-fastcgi-include.patch BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 BuildRequires: cmake >= 3.0.0 @@ -46,6 +51,7 @@ BuildRequires: libexiv2-devel BuildRequires: libqscintilla_qt5-devel BuildRequires: libspatialindex-devel +BuildRequires: libzstd-devel BuildRequires: ocl-icd-devel BuildRequires: opencl-cpp-headers BuildRequires: pkgconfig @@ -138,7 +144,11 @@ Recommends: %{name}-sample-data Recommends: apache2-mod_fcgid Recommends: gpsbabel +%if %is_ltr +Conflicts: qgis +%else Conflicts: qgis-ltr +%endif Conflicts: qgis-master Obsoletes: qgis2 %if %{with grass} @@ -151,16 +161,16 @@ %package devel Summary: Development Libraries for QGIS Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} Requires: python3-qt5-devel -Requires: qgis = %{version} %if %{with grass} %package plugin-grass Summary: GRASS Support Libraries for QGIS Group: Productivity/Graphics/Visualization/Other +Requires: %{name} = %{version} Requires: grass > 7.0 Requires: grass-doc -Requires: qgis = %{version} -Obsoletes: qgis-plugin-grass < %{version} +Obsoletes: %{name}-plugin-grass < %{version} %description plugin-grass GRASS plugin for QGIS required to interface with GRASS system. @@ -186,7 +196,7 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Alaska area. %prep -%autosetup -p1 +%autosetup -p1 -n qgis-%{version} # 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 @@ -215,6 +225,7 @@ -DWITH_SERVER=TRUE \ -DWITH_SERVER_PLUGINS=TRUE \ -DWITH_POSTGRESQL=TRUE \ + -DFCGI_INCLUDE_DIR=%{_includedir}/fastcgi \ -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \ -DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql \ -DQGIS_PLUGIN_SUBDIR=%{_lib}/qgis \ ++++++ fix-fastcgi-include.patch ++++++ --- qgis-3.18.0/src/server/qgis_map_serv.cpp.orig 2021-02-24 17:05:17.609036243 +0100 +++ qgis-3.18.0/src/server/qgis_map_serv.cpp 2021-02-24 17:05:31.697185106 +0100 @@ -23,7 +23,7 @@ #include "qgsfcgiserverrequest.h" #include "qgsapplication.h" -#include <fcgi_stdio.h> +#include <fastcgi/fcgi_stdio.h> #include <cstdlib> #include <QFontDatabase> ++++++ qgis-3.14.16.tar.bz2 -> qgis-3.18.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/qgis/qgis-3.14.16.tar.bz2 /work/SRC/openSUSE:Factory/.qgis.new.2378/qgis-3.18.0.tar.bz2 differ: char 11, line 1 ++++++ qgis-3.14.16.tar.bz2.sha256 -> qgis-3.18.0.tar.bz2.sha256 ++++++ --- /work/SRC/openSUSE:Factory/qgis/qgis-3.14.16.tar.bz2.sha256 2020-09-17 14:48:11.435758662 +0200 +++ /work/SRC/openSUSE:Factory/.qgis.new.2378/qgis-3.18.0.tar.bz2.sha256 2021-03-05 13:49:27.791850549 +0100 @@ -1 +1 @@ -c9915c2e577f1812a2b35b678b123c58407e07824d73e5ec0dda13db7ca75c04 qgis-3.14.16.tar.bz2 +09aa83ea7e193adec1f490feeaae8644fddbcbb964a858a1e8f740e665fa1563 qgis-3.18.0.tar.bz2
