Accepting request 874926 from home:Guillaume_G:branches:Application:Geo

- 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
- Update to 3.16.4
- Update spec file to ease future move from qgis to qgis-ltr

OBS-URL: https://build.opensuse.org/request/show/874926
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=319

fix-fastcgi-include.patch

@@ -0,0 +1,11 @@
+--- 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.16.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd57314c1913639f02b64df03eef041172aa220f249e318da3849fc71ada4d04
-size 114542609

qgis-3.16.3.tar.bz2.sha256

@@ -1 +0,0 @@
-fd57314c1913639f02b64df03eef041172aa220f249e318da3849fc71ada4d04  qgis-3.16.3.tar.bz2

qgis-3.18.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09aa83ea7e193adec1f490feeaae8644fddbcbb964a858a1e8f740e665fa1563
+size 120417944

qgis-3.18.0.tar.bz2.sha256

@@ -0,0 +1 @@
+09aa83ea7e193adec1f490feeaae8644fddbcbb964a858a1e8f740e665fa1563  qgis-3.18.0.tar.bz2

qgis-fix-return.patch

@@ -1,21 +0,0 @@
-From 10ab25e13d934a898c7b11f2f07faed10ba2ae9e Mon Sep 17 00:00:00 2001
-From: Nyall Dawson <nyall.dawson@gmail.com>
-Date: Mon, 16 Nov 2020 07:09:57 +1000
-Subject: [PATCH] Fix build warning on gcc
-
----
- src/gui/raster/qgscolorrampshaderwidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/raster/qgscolorrampshaderwidget.cpp b/src/gui/raster/qgscolorrampshaderwidget.cpp
-index 44e8a4773767..529c7bc197f7 100644
---- a/src/gui/raster/qgscolorrampshaderwidget.cpp
-+++ b/src/gui/raster/qgscolorrampshaderwidget.cpp
-@@ -766,6 +766,7 @@ QString QgsColorRampShaderWidget::createLabel( QTreeWidgetItem *currentItem, int
-         return QLocale().toString( val, 'f', mLabelPrecisionSpinBox->value() );
-       }
-     }
-+    return QString();
-   };
- 
-   QgsColorRampShader::Type interpolation = static_cast< QgsColorRampShader::Type >( mColorInterpolationComboBox->currentData().toInt() );

qgis.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Feb 24 13:41:32 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- 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 <guillaume.gardet@opensuse.org>
+
+- 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 <guillaume.gardet@opensuse.org>
 

qgis.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package qgis
+# spec file for package qgis-ltr
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -16,20 +16,25 @@
 #
 
 
+%define is_ltr 0
+
 %bcond_without grass
+%if %is_ltr
+Name:           qgis-ltr
+%else
 Name:           qgis
-Version:        3.16.3
+%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
+Source:         https://qgis.org/downloads/qgis-%{version}.tar.bz2
-Source1:        https://qgis.org/downloads/%{name}-%{version}.tar.bz2.sha256
+Source1:        https://qgis.org/downloads/qgis-%{version}.tar.bz2.sha256
 Source2:        %{name}.rpmlintrc
 Source3:        qgis_sample_data.zip
-# PATCH-FIX-UPSTREAM - https://github.com/LU-sir/QGIS/commit/10ab25e13d934a898c7b11f2f07faed10ba2ae9e
+Patch1:         fix-fastcgi-include.patch
-Patch1:         qgis-fix-return.patch
 BuildRequires:  FastCGI-devel
 BuildRequires:  bison >= 2.4
 BuildRequires:  cmake >= 3.0.0
@@ -46,6 +51,7 @@ BuildRequires:  libQt5Sql5-sqlite
 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 @@ Requires:       python3-termcolor
 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 @@ BuildRequires:  memory-constraints
 %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:      %{name}-plugin-grass < %{version}
-Obsoletes:      qgis-plugin-grass < %{version}
 
 %description plugin-grass
 GRASS plugin for QGIS required to interface with GRASS system.
@@ -186,7 +196,7 @@ Development packages for QGIS, including the C header files.
 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 @@ export PATH=$PATH:$QTDIR/bin
   -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 \