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-11-09 23:54:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qgis (Old)
 and      /work/SRC/openSUSE:Factory/.qgis.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qgis"

Tue Nov  9 23:54:58 2021 rev:28 rq:930395 version:3.22.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/qgis/qgis.changes        2021-10-26 
20:27:17.818445983 +0200
+++ /work/SRC/openSUSE:Factory/.qgis.new.1890/qgis.changes      2021-11-09 
23:55:24.151976842 +0100
@@ -1,0 +2,14 @@
+Fri Nov  5 12:28:10 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Update to 3.22.0
+  https://changelog.qgis.org/en/qgis/version/3.22/
+- Drop upstreamed patches
+  * qgis-fix-missing-qwt-inc.patch
+  * qgis-fix-missing-qwt-inc-part2.patch
+- Refresh fix-fastcgi-include.patch
+- Add recommendation for mod_spatialite -- boo#1185415
+- Suggest saga-gis -- boo#1190435
+- Enable SIP6 and add qgis-pr45830-sip6-gil.patch -- boo#1192300
+- Update qgis.rpmlintrc
+
+-------------------------------------------------------------------

Old:
----
  qgis-3.20.3.tar.bz2
  qgis-3.20.3.tar.bz2.sha256
  qgis-fix-missing-qwt-inc-part2.patch
  qgis-fix-missing-qwt-inc.patch

New:
----
  qgis-3.22.0.tar.bz2
  qgis-3.22.0.tar.bz2.sha256
  qgis-pr45830-sip6-gil.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qgis.spec ++++++
--- /var/tmp/diff_new_pack.UOw8Bt/_old  2021-11-09 23:55:26.347977962 +0100
+++ /var/tmp/diff_new_pack.UOw8Bt/_new  2021-11-09 23:55:26.351977964 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package qgis
+# spec file for package qgis-ltr
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -24,7 +24,7 @@
 %else
 Name:           qgis
 %endif
-Version:        3.20.3
+Version:        3.22.0
 Release:        0
 Summary:        A Geographic Information System (GIS)
 License:        GPL-2.0-only
@@ -35,10 +35,8 @@
 Source2:        %{name}.rpmlintrc
 Source3:        qgis_sample_data.zip
 Patch1:         fix-fastcgi-include.patch
-# PATCH-FIX-UPSTREAM - 
https://github.com/qgis/QGIS/commit/6f9cbde7c782274ebe5875da7dbac98d68e9827
-Patch2:         qgis-fix-missing-qwt-inc.patch
-# PATCH-FIX-UPSTREAM - 
https://github.com/qgis/QGIS/commit/581cb40603dd3daca2916b564a4cd2630d005556
-Patch3:         qgis-fix-missing-qwt-inc-part2.patch
+# PATCH-FIX-UPSTREAM ggis-pr45830-sip6-gil.patch -- release GIL with sip6 
https://github.com/qgis/QGIS/pull/45830
+Patch2:         
https://github.com/qgis/QGIS/pull/45830.patch#/qgis-pr45830-sip6-gil.patch
 # PATCH-FIX-UPSTREAM - scan for pdal-config instead of pdal in cmake
 Patch4:         qgis-fix-cmake-findpdal.patch
 BuildRequires:  FastCGI-devel
@@ -71,14 +69,11 @@
 BuildRequires:  python3-future
 BuildRequires:  python3-psycopg2
 BuildRequires:  python3-pygments
+BuildRequires:  python3-pyqt-builder
 BuildRequires:  python3-qscintilla-qt5
 BuildRequires:  python3-qscintilla-qt5-sip
 BuildRequires:  python3-qt5-devel
-# The package can build with sip v4 or sip v5 but needs to use the same module
-# as PyQt5 (python-sip vs python-qt5-sip).The correct sip.so is pulled in by
-# python-qt5, do not explicitly depend on it.
-# qgis is not compatible with sip6 yet - 
https://github.com/qgis/QGIS/issues/38911
-BuildRequires:  python3-sip5-devel
+BuildRequires:  python3-sip-devel
 BuildRequires:  python3-six
 BuildRequires:  python3-termcolor
 BuildRequires:  qwt6-devel
@@ -146,6 +141,9 @@
 Recommends:     %{name}-sample-data
 Recommends:     apache2-mod_fcgid
 Recommends:     gpsbabel
+Recommends:     mod_spatialite
+# It's in Application:Geo, but not in Factory
+Suggests:       saga-gis
 %if %is_ltr
 Conflicts:      qgis
 %else
@@ -301,8 +299,8 @@
 %exclude %{_libdir}/libqgisgrass7.so
 %exclude %{_libdir}/libqgisgrass7.so.*
 %exclude %{_libdir}/qgis/libgrassplugin7.so
-%exclude %{_libdir}/qgis/libgrassprovider7.so
-%exclude %{_libdir}/qgis/libgrassrasterprovider7.so
+%exclude %{_libdir}/qgis/libprovider_grass7.so
+%exclude %{_libdir}/qgis/libprovider_grassraster7.so
 %exclude %{_libdir}/qgis/grass
 %endif
 %exclude %{_datadir}/qgis/%{sampledir}
@@ -311,13 +309,12 @@
 
 %files devel
 %{_includedir}/qgis/
-%{_libdir}/liboauth2authmethod_static.a
 
 %if %{with grass}
 %files plugin-grass
 %{_libdir}/qgis/libgrassplugin7.so
-%{_libdir}/qgis/libgrassprovider7.so
-%{_libdir}/qgis/libgrassrasterprovider7.so
+%{_libdir}/qgis/libprovider_grass7.so
+%{_libdir}/qgis/libprovider_grassraster7.so
 %{_libdir}/libqgisgrass7.so
 %{_libdir}/libqgisgrass7.so.*
 %defattr(755,root,root)

++++++ fix-fastcgi-include.patch ++++++
--- /var/tmp/diff_new_pack.UOw8Bt/_old  2021-11-09 23:55:26.375977976 +0100
+++ /var/tmp/diff_new_pack.UOw8Bt/_new  2021-11-09 23:55:26.375977976 +0100
@@ -1,8 +1,10 @@
---- 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"
+Index: qgis-3.22.0/src/server/qgis_map_serv.cpp
+===================================================================
+--- qgis-3.22.0.orig/src/server/qgis_map_serv.cpp
++++ qgis-3.22.0/src/server/qgis_map_serv.cpp
+@@ -24,7 +24,7 @@
  #include "qgsapplication.h"
+ #include "qgscommandlineutils.h"
  
 -#include <fcgi_stdio.h>
 +#include <fastcgi/fcgi_stdio.h>

++++++ qgis-3.20.3.tar.bz2 -> qgis-3.22.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/qgis/qgis-3.20.3.tar.bz2 
/work/SRC/openSUSE:Factory/.qgis.new.1890/qgis-3.22.0.tar.bz2 differ: char 11, 
line 1

++++++ qgis-3.20.3.tar.bz2.sha256 -> qgis-3.22.0.tar.bz2.sha256 ++++++
--- /work/SRC/openSUSE:Factory/qgis/qgis-3.20.3.tar.bz2.sha256  2021-10-26 
20:27:17.806445976 +0200
+++ /work/SRC/openSUSE:Factory/.qgis.new.1890/qgis-3.22.0.tar.bz2.sha256        
2021-11-09 23:55:24.123976829 +0100
@@ -1 +1 @@
-93ac52138f4f7832078e6e79ed5249dcd8c3dd34c8801c4039f87b690657294e  
qgis-3.20.3.tar.bz2
+cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b  
qgis-3.22.0.tar.bz2

++++++ qgis-pr45830-sip6-gil.patch ++++++
>From 6559a76cd6e02b442c15d895bfde827e1e25e9e6 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisan...@gmail.com>
Date: Wed, 3 Nov 2021 09:31:16 +0100
Subject: [PATCH] Set release_gil = True when generating bindings

---
 python/3d/project.py.in       | 1 +
 python/analysis/project.py.in | 1 +
 python/core/project.py.in     | 1 +
 python/gui/project.py.in      | 1 +
 python/server/project.py.in   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/python/3d/project.py.in b/python/3d/project.py.in
index ecbdce41f570..df8f76b7f5d6 100644
--- a/python/3d/project.py.in
+++ b/python/3d/project.py.in
@@ -37,6 +37,7 @@ class Qgis3D(PyQtBindings):
         super().__init__(project, '3d')
         self.sip_file = '3d.sip'
         self.exceptions = True
+        self.release_gil = True
         self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
 
     def apply_user_defaults(self, tool):
diff --git a/python/analysis/project.py.in b/python/analysis/project.py.in
index d62cfc8d7c5e..55c65cf0b34b 100644
--- a/python/analysis/project.py.in
+++ b/python/analysis/project.py.in
@@ -37,6 +37,7 @@ class QgisAnalysis(PyQtBindings):
         super().__init__(project, 'analysis')
         self.sip_file = 'analysis.sip'
         self.exceptions = True
+        self.release_gil = True
         self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
 
     def apply_user_defaults(self, tool):
diff --git a/python/core/project.py.in b/python/core/project.py.in
index 1fd92b7f9374..5f383d434d15 100644
--- a/python/core/project.py.in
+++ b/python/core/project.py.in
@@ -37,6 +37,7 @@ class QgisCore(PyQtBindings):
         super().__init__(project, 'core')
         self.sip_file = 'core.sip'
         self.exceptions = True
+        self.release_gil = True
         self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
 
     def apply_user_defaults(self, tool):
diff --git a/python/gui/project.py.in b/python/gui/project.py.in
index aa9cd77f7036..c6a751721136 100644
--- a/python/gui/project.py.in
+++ b/python/gui/project.py.in
@@ -37,6 +37,7 @@ class QgisGui(PyQtBindings):
         super().__init__(project, 'gui')
         self.sip_file = 'gui.sip'
         self.exceptions = True
+        self.release_gil = True
         self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
 
     def apply_user_defaults(self, tool):
diff --git a/python/server/project.py.in b/python/server/project.py.in
index a07045619c15..146d96a56448 100644
--- a/python/server/project.py.in
+++ b/python/server/project.py.in
@@ -37,6 +37,7 @@ class QgisServer(PyQtBindings):
         super().__init__(project, 'server')
         self.sip_file = 'server.sip'
         self.exceptions = True
+        self.release_gil = True
         self.disabled_features = "@SIP_DISABLE_FEATURES@".split(";")
 
     def apply_user_defaults(self, tool):
++++++ qgis.rpmlintrc ++++++
--- /var/tmp/diff_new_pack.UOw8Bt/_old  2021-11-09 23:55:26.439978008 +0100
+++ /var/tmp/diff_new_pack.UOw8Bt/_new  2021-11-09 23:55:26.439978008 +0100
@@ -1,3 +1,11 @@
-addFilter("devel-file-in-non-devel-package .*/usr/lib/libqgis*.*")
-addFilter("devel-file-in-non-devel-package .*/usr/lib64/libqgis*.*")
+addFilter("devel-file-in-non-devel-package .*/usr/lib.*/libqgis*.*")
 addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/qgis/.*")
+addFilter("zero-length .*sample-data.*gtopo30")
+# QGIS Server Files in QGIS_CGIBIN_DIR
+addFilter("script-without-shebang .*admin.sld")
+addFilter("script-without-shebang .*wms_metadata.xml")
+addFilter("non-executable-in-bin .*admin.sld")
+addFilter("non-executable-in-bin .*wms_metadata.xml")
+# intentional forced dependencies
+addFilter("explicit-lib-dependency libQt5Sql5-.*sql.*")
+addFilter("explicit-lib-dependency python.*-OWSLib")
\ No newline at end of file

Reply via email to