Hello community, here is the log from the commit of package qgis for openSUSE:Factory checked in at 2020-01-03 17:36:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qgis (Old) and /work/SRC/openSUSE:Factory/.qgis.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qgis" Fri Jan 3 17:36:59 2020 rev:7 rq:760477 version:3.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qgis/qgis.changes 2019-12-04 14:20:24.650439691 +0100 +++ /work/SRC/openSUSE:Factory/.qgis.new.6675/qgis.changes 2020-01-03 17:37:01.071296696 +0100 @@ -1,0 +2,5 @@ +Thu Jan 2 10:18:47 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch Fix-build-with-txt2tags-3.3.patch + +------------------------------------------------------------------- New: ---- Fix-build-with-txt2tags-3.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qgis.spec ++++++ --- /var/tmp/diff_new_pack.qaslqL/_old 2020-01-03 17:37:02.503297431 +0100 +++ /var/tmp/diff_new_pack.qaslqL/_new 2020-01-03 17:37:02.507297434 +0100 @@ -1,7 +1,7 @@ # # spec file for package qgis # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,10 @@ Source2: %{name}.rpmlintrc Source3: qgis_sample_data.zip # PATCH-FIX-UPSTREAM fix randomness in desktop file translations -Patch2: qgis-3.8.3-reproducible.patch -Patch3: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch +Patch0: qgis-3.8.3-reproducible.patch +Patch1: a07d915d7bf9c7c54b2047f8819ba2aae6669f35.patch +# PATCH-FIX-UPSTREAM fix build with recent txt2tags versions +Patch2: Fix-build-with-txt2tags-3.3.patch BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 BuildRequires: cmake >= 3.0.0 @@ -179,9 +181,7 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Alaska area. %prep -%setup -q -%patch2 -p1 -%patch3 -p1 +%autosetup -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 ++++++ Fix-build-with-txt2tags-3.3.patch ++++++ ++++ 12537 lines (skipped)
