Update to 3.18.3

Update to 3.18.2
Rebuilt for removed libstdc++ symbols (#1937698 )
2021-05-16 10:13:44 +02:00 · 2021-04-17 10:22:42 +02:00 · 2021-04-17 10:22:42 +02:00 · 2021-04-17 10:22:42 +02:00 · 2021-04-17 10:22:42 +02:00 · 2021-04-17 10:22:41 +02:00
13 changed files with 154 additions and 9958 deletions
--- a/.gitignore
+++ b/.gitignore
@ -63,104 +63,3 @@ qgis_1.5.0.tar.gz
 /qgis-3.18.1.tar.bz2
 /qgis-3.18.2.tar.bz2
 /qgis-3.18.3.tar.bz2
-/qgis-3.20.1.tar.bz2
-/qgis-3.20.2.tar.bz2
-/qgis-3.20.3.tar.bz2
-/qgis-3.22.0.tar.bz2
-/qgis-3.22.1.tar.bz2
-/qgis-3.22.2.tar.bz2
-/qgis-3.22.3.tar.bz2
-/qgis-3.24.0-vendor.tar.xz
-/qgis-3.24.0.tar.bz2
-/qgis-3.24.1.tar.bz2
-/qgis-3.24.1-vendor.tar.xz
-/qgis-3.24.2.tar.bz2
-/qgis-3.24.2-vendor.tar.xz
-/qgis-3.24.3-vendor.tar.xz
-/qgis-3.24.3.tar.bz2
-/qgis-3.26.0.tar.bz2
-/qgis-3.26.0-vendor.tar.xz
-/qgis-3.26.1.tar.bz2
-/qgis-3.26.1-vendor.tar.xz
-/qgis-3.26.2.tar.bz2
-/qgis-3.26.2-vendor.tar.xz
-/qgis-3.26.3.tar.bz2
-/qgis-3.26.3-vendor.tar.xz
-/qgis-3.28.0.tar.bz2
-/qgis-3.28.0-vendor.tar.xz
-/qgis-3.28.1.tar.bz2
-/qgis-3.28.1-vendor.tar.xz
-/qgis-3.28.2.tar.bz2
-/qgis-3.28.2-vendor.tar.xz
-/qgis-3.28.3.tar.bz2
-/qgis-3.28.3-vendor.tar.xz
-/qgis-3.30.0.tar.bz2
-/qgis-3.30.0-vendor.tar.xz
-/qgis-3.30.1.tar.bz2
-/qgis-3.30.1-vendor.tar.xz
-/qgis-3.30.2.tar.bz2
-/qgis-3.30.2-vendor.tar.xz
-/qgis-3.30.3.tar.bz2
-/qgis-3.30.3-vendor.tar.xz
-/qgis-3.32.0.tar.bz2
-/qgis-3.32.0-vendor.tar.xz
-/qgis-3.32.1.tar.bz2
-/qgis-3.32.1-vendor.tar.xz
-/qgis-3.32.2.tar.bz2
-/qgis-3.32.2-vendor.tar.xz
-/qgis-3.32.3-vendor.tar.xz
-/qgis-3.32.3.tar.bz2
-/qgis-3.34.0-vendor.tar.xz
-/qgis-3.34.0.tar.bz2
-/qgis-3.34.1.tar.bz2
-/qgis-3.34.1-vendor.tar.xz
-/qgis-3.34.2-vendor.tar.xz
-/qgis-3.34.2.tar.bz2
-/qgis-3.34.3.tar.bz2
-/qgis-3.34.3-vendor.tar.xz
-/qgis-3.36.0.tar.bz2
-/qgis-3.36.0-vendor.tar.xz
-/qgis-3.36.1.tar.bz2
-/qgis-3.36.1-vendor.tar.xz
-/qgis-3.36.2.tar.bz2
-/qgis-3.36.2-vendor.tar.xz
-/qgis-3.36.3.tar.bz2
-/qgis-3.36.3-vendor.tar.xz
-/qgis-3.38.0.tar.bz2
-/qgis-3.38.0-vendor.tar.xz
-/qgis-3.38.1.tar.bz2
-/qgis-3.38.1-vendor.tar.xz
-/qgis-3.38.2.tar.bz2
-/qgis-3.38.2-vendor.tar.xz
-/qgis-3.38.3.tar.bz2
-/qgis-3.38.3-vendor.tar.xz
-/qgis-3.40.0-vendor.tar.xz
-/qgis-3.40.0.tar.bz2
-/qgis-3.40.1.tar.bz2
-/qgis-3.40.1-vendor.tar.xz
-/qgis-3.40.2.tar.bz2
-/qgis-3.40.2-vendor.tar.xz
-/qgis-3.40.3.tar.bz2
-/qgis-3.40.3-vendor.tar.xz
-/qgis-3.42.0-vendor.tar.xz
-/qgis-3.42.0.tar.bz2
-/qgis-3.42.1.tar.bz2
-/qgis-3.42.1-vendor.tar.xz
-/qgis-3.42.2.tar.bz2
-/qgis-3.42.2-vendor.tar.xz
-/qgis-3.42.3.tar.bz2
-/qgis-3.42.3-vendor.tar.xz
-/qgis-3.44.0.tar.bz2
-/qgis-3.44.0-vendor.tar.xz
-/qgis-3.44.1.tar.bz2
-/qgis-3.44.1-vendor.tar.xz
-/qgis-3.44.2-vendor.tar.xz
-/qgis-3.44.2.tar.bz2
-/qgis-3.44.3.tar.bz2
-/qgis-3.44.3-vendor.tar.xz
-/qgis-3.44.4.tar.bz2
-/qgis-3.44.4-vendor.tar.xz
-/qgis-3.44.5.tar.bz2
-/qgis-3.44.5-vendor.tar.xz
-/qgis-3.44.6.tar.bz2
-/qgis-3.44.6-vendor.tar.xz
--- a/CVE-2024-55565.prebundle.patch
+++ b/CVE-2024-55565.prebundle.patch
@ -1,17 +0,0 @@
-diff -rupN qgis-3.42.1/resources/server/src/landingpage/yarn.lock qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock
--- qgis-3.42.1/resources/server/src/landingpage/yarn.lock	2025-03-21 13:35:59.000000000 +0100
-+++ qgis-3.42.1-new/resources/server/src/landingpage/yarn.lock	2025-03-23 10:16:16.924733787 +0100
-@@ -7719,13 +7719,6 @@ shellwords@^0.1.1:
-   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
- 
-shortid@^2.2.15:
-  version "2.2.16"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608"
-  integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==
-  dependencies:
-    nanoid "^2.1.0"
-
- side-channel-list@^1.0.0:
-   version "1.0.0"
-   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
--- a/prepare_vendor.sh
+++ b/prepare_vendor.sh
@ -1,108 +0,0 @@
-#!/bin/bash
-
-PKG_URL=$(spectool *.spec --source 0 | sed -e 's/Source0:[ ]*//g')
-PKG_TARBALL=$(basename $PKG_URL)
-PKG_NAME=$(rpmspec -q --queryformat="%{NAME}" *.spec --srpm)
-PKG_VERSION=$(rpmspec -q --queryformat="%{VERSION}" *.spec --srpm)
-PKG_SRCDIR="${PKG_NAME}-${PKG_VERSION}"
-PKG_DIR="$(pwd)"
-PKG_TMPDIR=$(mktemp --tmpdir -d ${PKG_NAME}-XXXXXXXX)
-PKG_PATH="$PKG_TMPDIR/$PKG_SRCDIR/resources/server/src/landingpage/"
-
-echo "URL:     $PKG_URL"
-echo "TARBALL: $PKG_TARBALL"
-echo "NAME:    $PKG_NAME"
-echo "VERSION: $PKG_VERSION"
-echo "PATH:    $PKG_PATH"
-
-cleanup_tmpdir() {
-    popd 2>/dev/null
-    rm -rf $PKG_TMPDIR
-}
-trap cleanup_tmpdir SIGINT
-
-cleanup_and_exit() {
-    cleanup_tmpdir
-    if test "$1" = 0 -o -z "$1" ; then
-        exit 0
-    else
-        exit $1
-    fi
-}
-
-if [ ! -w "$PKG_TARBALL" ]; then
-    wget "$PKG_URL"
-fi
-
-
-mkdir -p $PKG_TMPDIR
-tar -xf $PKG_TARBALL -C $PKG_TMPDIR
-
-pushd $PKG_TMPDIR/$PKG_SRCDIR
-echo ">>>>>> Applying prebundle patches"
-for file in $(ls -1 $PKG_DIR/*.prebundle.patch 2>/dev/null); do
-patch -p1 < $file
-done
-popd
-
-pushd $PKG_PATH
-
-export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
-echo ">>>>>> Install npm modules"
-yarn install --frozen-lockfile --ignore-engines
-if [ $? -ne 0 ]; then
-    echo "ERROR: yarn install failed"
-    cleanup_and_exit 1
-fi
-
-echo ">>>>>> Cleanup object dirs"
-find node_modules/ -type d -name "*.o.d" | xargs rm -rf
-find node_modules/ -type d -name "__pycache__" | xargs rm -rf
-
-
-echo ">>>>>> Cleanup object files"
-find node_modules/ -name "*.node" | xargs rm -rf
-
-find node_modules/ -name "*.dll" | grep -v signal-client | xargs rm -f
-find node_modules/ -name "*.dylib" -delete
-find node_modules/ -name "*.so" -delete
-find node_modules/ -name "*.o" -delete
-find node_modules/ -name "*.a" -delete
-find node_modules/ -name "*.snyk-*.flag" -delete
-
-echo ">>>>>> Cleanup build info"
-find node_modules/ -name "builderror.log" -delete
-find node_modules/ -name "yarn-error.log" -delete
-find node_modules/ -name "yarn.lock" -delete
-find node_modules/ -name ".deps" -type d | xargs rm -rf
-find node_modules/ -name "Makefile" -delete
-find node_modules/ -name "*.target.mk" -delete
-find node_modules/ -name "config.gypi" -delete
-find node_modules/ -name "package.json" -exec sed -i "s#$PKG_PATH#/tmp#g" {} \;
-
-echo ">>>>>> Cleanup yarn taballs"
-find node_modules/ -name ".yarn-tarball.tgz" -delete
-
-echo ">>>>>> Cleanup source maps"
-find node_modules/ -name "*.js.map" -delete
-find node_modules/ -name "*.ts.map" -delete
-find node_modules/ -name "*.mjs.map" -delete
-find node_modules/ -name "*.cjs.map" -delete
-find node_modules/ -name "*.css.map" -delete
-find node_modules/ -name "*.min.map" -delete
-
-echo ">>>>>> Package vendor files"
-rm -f $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz
-XZ_OPT="-T$(nproc)" tar cJf $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor.tar.xz .package-cache
-if [ $? -ne 0 ]; then
-    cleanup_and_exit 1
-fi
-
-yarn add license-checker --ignore-engines
-yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt
-cp -a yarn.lock $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-yarn.lock
-
-popd
-
-rm -rf .package-cache
-cleanup_and_exit 0
--- a/qgis-3.44.6-vendor-licenses.txt
+++ b/qgis-3.44.6-vendor-licenses.txt
@ -1,26 +0,0 @@
-yarn run v1.22.22
-$ /tmpnode_modules/.bin/license-checker --summary
-├─ MIT: 1056
-├─ ISC: 78
-├─ BSD-3-Clause: 34
-├─ BSD-2-Clause: 29
-├─ Apache-2.0: 25
-├─ MIT*: 4
-├─ (MIT OR CC0-1.0): 4
-├─ Unlicense: 3
-├─ (MIT OR Apache-2.0): 2
-├─ CC0-1.0: 2
-├─ (MIT AND CC-BY-3.0): 2
-├─ 0BSD: 2
-├─ UNLICENSED: 1
-├─ Python-2.0: 1
-├─ CC-BY-4.0: 1
-├─ BSD*: 1
-├─ (BSD-3-Clause OR GPL-2.0): 1
-├─ (WTFPL OR MIT): 1
-├─ MIT,Apache2: 1
-├─ (MIT AND BSD-3-Clause): 1
-├─ CC-BY-3.0: 1
-└─ MPL-2.0: 1
-
-Done in 2.65s.
--- a/qgis-3.44.6-yarn.lock
+++ b/qgis-3.44.6-yarn.lock
--- a/qgis-lib64.patch
+++ b/qgis-lib64.patch
@ -0,0 +1,12 @@
+diff -rupN --no-dereference qgis-3.18.1/cmake/PyQtMacros.cmake qgis-3.18.1-new/cmake/PyQtMacros.cmake
+--- qgis-3.18.1/cmake/PyQtMacros.cmake	2021-03-19 13:09:08.000000000 +0100
+++ qgis-3.18.1-new/cmake/PyQtMacros.cmake	2021-03-24 00:58:44.476156905 +0100
+@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE(CMAKE_HOST_WIN32)
+     # TODO osx
+     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
+-    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
+    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+   ENDIF(CMAKE_HOST_WIN32)
+ 
+   FOREACH(it ${ARGN})
--- a/qgis-mime.xml
+++ b/qgis-mime.xml
@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+
+  <mime-type type="application/x-qgis-project">
+    <comment>QGIS Project</comment>
+    <comment xml:lang="de">QGIS-Projekt</comment>
+    <sub-class-of type="application/xml"/>
+    <alias type="application/x-qgis"/>
+    <icon name="qgis-mime"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis projectname"/>
+      </match>
+    </magic>
+    <glob pattern="*.qgs"/>
+  </mime-type>
+
+  <mime-type type="application/x-qgis-layer-settings">
+    <comment>QGIS layer settings</comment>
+    <comment xml:lang="de">QGIS Layer Einstellungen</comment>
+    <sub-class-of type="application/xml"/>
+    <icon name="qgis-mime"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qml"/>
+  </mime-type>
+</mime-info>
--- a/qgis-server-README.fedora
+++ b/qgis-server-README.fedora
@ -29,3 +29,33 @@ Please fill in the metadata tab for your QGIS project.

 You can easily test your WMS by adding it as a WMS layer in QGIS.

+==================================================
+
+The traditional QGIS server configuration is less comfortable and
+I don't encourage it, unless you have a good reason to use it:
+
+This approach only allows for a single map service.
+
+It uses two configuration files, that must be located in the same
+directory as the FCGI binary:
+
+ - admin.sld
+ - wms_metadata.xml
+
+"admin.sld" uses extended SLD syntax (Style Layer Descriptor) to
+describe symbolization of data.
+
+"wms_metadata.xml" supplies metadata for your WMS. You may also use this
+file with the kind of configuration mentioned on top. But if you want to
+serve different projects, and metadata varies between them, that file
+won't work for you. Please see above for how to define project specific
+metadata!
+
+Both configuration files are included as documentation.
+
+==================================================
+
+Further information: http://karlinapp.ethz.ch/qgis_wms
+
+    Volker Fröhlich
+    volker27@gmx.at
--- a/qgis-serverprefix.patch
+++ b/qgis-serverprefix.patch
@ -1,7 +1,7 @@
-diff -rupN --no-dereference qgis-3.44.6/src/core/qgsapplication.cpp qgis-3.44.6-new/src/core/qgsapplication.cpp
--- qgis-3.44.6/src/core/qgsapplication.cpp	2025-12-19 13:02:37.000000000 +0100
-+++ qgis-3.44.6-new/src/core/qgsapplication.cpp	2025-12-20 13:43:24.341223415 +0100
-@@ -387,6 +387,11 @@ void QgsApplication::init( QString profi
+diff -rupN --no-dereference qgis-3.18.1/src/core/qgsapplication.cpp qgis-3.18.1-new/src/core/qgsapplication.cpp
+--- qgis-3.18.1/src/core/qgsapplication.cpp	2021-03-19 13:09:08.000000000 +0100
+++ qgis-3.18.1-new/src/core/qgsapplication.cpp	2021-03-24 00:58:46.103156947 +0100
+@@ -311,6 +311,11 @@ void QgsApplication::init( QString profi
         {
           myDir.cdUp();
         }
--- a/qgis-yarn-offline.patch
+++ b/qgis-yarn-offline.patch
@ -1,12 +0,0 @@
-diff -rupN --no-dereference qgis-3.44.6/resources/CMakeLists.txt qgis-3.44.6-new/resources/CMakeLists.txt
--- qgis-3.44.6/resources/CMakeLists.txt	2025-12-19 13:02:37.000000000 +0100
-+++ qgis-3.44.6-new/resources/CMakeLists.txt	2025-12-20 13:43:26.680887755 +0100
-@@ -47,7 +47,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP)
-   # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first:
-   file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake
-   "execute_process(
-      COMMAND ${YARN} install --frozen-lockfile
-+      COMMAND ${YARN} install --frozen-lockfile --offline
-       WORKING_DIRECTORY ${LANDINGPAGE_OUTPUT_PATH}
-       OUTPUT_QUIET
-       ERROR_FILE ${CMAKE_BINARY_DIR}/yarn_error.log
--- a/qgis.spec
+++ b/qgis.spec
@ -1,38 +1,39 @@
+%global grass7_prefix $(pkg-config --variable=prefix grass 2>/dev/null || echo '%{_libdir}/grass76')
+
+
+# Shared lib calls exit
+# https://issues.qgis.org/issues/2854
+
 #TODO: Run test suite (see debian/rules)

 Name:           qgis
-Version:        3.44.6
-Release:        2%{?dist}
+Version:        3.18.3
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System

 # http://issues.qgis.org/issues/3789
-#               QGIS license         the bundled JS code (see %%{name}-%%{version}-vendor-licenses.txt)
-License:        GPL-2.0-or-later AND MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MIT AND (MIT OR CC0-1.0) AND Unlicense AND (MIT OR Apache-2.0) AND CC0-1.0 AND (MIT AND CC-BY-3.0) AND Python-2.0.1 AND CC-BY-4.0 AND (BSD-3-Clause OR GPL-2.0-only) AND (WTFPL OR MIT) AND (MIT AND BSD-3-Clause) AND CC-BY-3.0 AND MPL-2.0
+License:        GPLv3+ with exceptions
 URL:            http://www.qgis.org

 Source0:        http://qgis.org/downloads/%{name}-%{version}.tar.bz2
-# ./prepare_vendor.sh
-Source1:        %{name}-%{version}-vendor.tar.xz
-Source2:        %{name}-%{version}-vendor-licenses.txt
-Source3:        %{name}-%{version}-yarn.lock
 # Sample configuration files for QGIS server
-Source4:        %{name}-server-httpd.conf
-Source5:        %{name}-server-README.fedora
+Source2:        %{name}-server-httpd.conf
+Source4:        %{name}-server-README.fedora
+# MIME definitions
+# Based on debian/qgis.xml but excluding already defined or proprietary types
+#TODO: Path; Still necessary?
+Source5:        %{name}-mime.xml

+# Fix builds on 64-bit machines
+# https://issues.qgis.org/issues/15602
+Patch0:         %{name}-lib64.patch
 # Fix QGIS Server prefix calculation
-Patch0:         %{name}-serverprefix.patch
-# Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources
-Patch1:         %{name}-yarn-offline.patch
-
-# Applied by prepare_vendor.sh
-# CVE-2024-55565.prebundle.patch
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch:    %{ix86}
+Patch1:         %{name}-serverprefix.patch
+# Fix for Proj8 detection
+Patch2:         %{name}_proj8.patch

 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
-BuildRequires:  draco-devel
 BuildRequires:  exiv2-devel
 BuildRequires:  expat-devel
 BuildRequires:  fcgi-devel
@ -42,48 +43,37 @@ BuildRequires:  gdal-devel
 BuildRequires:  geos-devel
 BuildRequires:  grass-devel
 BuildRequires:  gsl-devel
-BuildRequires:  laszip-devel
-BuildRequires:  libdxfrw-devel
-BuildRequires:  libpq-devel
 BuildRequires:  libspatialite-devel
+BuildRequires:  libdxfrw-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libzip-devel
-BuildRequires:  ninja-build
+BuildRequires:  make
 BuildRequires:  netcdf-devel
 BuildRequires:  ocl-icd-devel
 BuildRequires:  opencl-headers
-# PDAL detection relies on pdal executable
-BuildRequires:  PDAL
-BuildRequires:  PDAL-devel
 BuildRequires:  poly2tri-devel
+BuildRequires:  postgresql-devel
 BuildRequires:  proj-devel
 BuildRequires:  protobuf-lite-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-qscintilla-qt5
 BuildRequires:  python3-qscintilla-qt5-devel
 BuildRequires:  python3-qt5-devel
-BuildRequires:  %{py3_dist sip} >= 5.3
-BuildRequires:  %{py3_dist PyQt-builder} >= 1
+BuildRequires:  python3-sip-devel
 BuildRequires:  qca-qt5-devel
 BuildRequires:  qscintilla-qt5-devel
 BuildRequires:  qt5-qt3d-devel
 BuildRequires:  qt5-qtbase-private-devel
 BuildRequires:  qt5-qtdeclarative-devel
 BuildRequires:  qt5-qtlocation-devel
-BuildRequires:  qt5-qtmultimedia-devel
 BuildRequires:  qt5-qtserialport-devel
 BuildRequires:  qt5-qttools-static
 BuildRequires:  qt5-qtwebkit-devel
 BuildRequires:  qtkeychain-qt5-devel
 BuildRequires:  qwt-qt5-devel
-%if 0%{?fedora} >= 43
-BuildRequires:  spatialindex2.0-devel
-%else
 BuildRequires:  spatialindex-devel
-%endif
 BuildRequires:  sqlite-devel
 BuildRequires:  libzstd-devel
-BuildRequires:  yarnpkg

 # Enable for tests
 #BuildRequires:  xorg-x11-server-Xvfb
@ -128,7 +118,7 @@ GRASS plugin for QGIS required to interface with the GRASS system.
 %{?python_provide:%python_provide python3-qgis}
 Summary:        Python integration and plug-ins for QGIS
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       python3-gdal
+Requires:       gdal-python3
 Requires:       python3-httplib2
 Requires:       python3-jinja2
 Requires:       python3-matplotlib
@ -137,8 +127,8 @@ Requires:       python3-psycopg2
 Requires:       python3-pygments
 Requires:       python3-PyYAML
 Requires:       python3-qscintilla-qt5
+Requires:       python3-qt5-webkit
 %{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}}
-Supplements:    %{name}%{?_isa} = %{version}-%{release}

 %description -n python3-qgis
 Python integration and plug-ins for QGIS.
@ -159,46 +149,41 @@ Please refer to %{name}-server-README.fedora for details!


 %prep
-%autosetup -p1 -a1
-
-# %%{name}-%%{version}-vendor-licenses.txt
-cp -a %{SOURCE2} .
-# %%{name}-%%{version}-yarn.lock
-cp -a %{SOURCE3} resources/server/src/landingpage/yarn.lock
+%autosetup -p1

 # Readme file for QGIS server configuration and Lighttpd example
-install -pm0644 %{SOURCE5} .
+install -pm0644 %{SOURCE4} .
+
+# Delete bundled libs
+#rm -r src/core/spatialite/
+#rm -r external/mdal*
+#rm -r external/qwtpolar*
+#rm -r external/libdxfrw*
+#rm -rf "python/ext-libs/!(CMakeLists.txt|tests)"
+#
+#rm -rf src/plugins/dxf2shp_converter/
+#sed -i '/dxf2shp_converter/d' src/plugins/CMakeLists.txt

 gzip ChangeLog

-sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 22"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/package.json')
-sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19"/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 22"/' $(find "$PWD/.package-cache" | grep 'node_modules/@achrinza/node-ipc/.yarn-metadata.json')

 %build
 %cmake \
      %{_cmake_skip_rpath} \
-      %["%{?_lib}" == "lib64" ? "-D LIB_SUFFIX=64" : ""] \
      -D QGIS_LIB_SUBDIR=%{_lib} \
      -D QGIS_MANUAL_SUBDIR=/share/man \
      -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
      -D WITH_BINDINGS:BOOL=TRUE \
-      -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-      -D WITH_GRASS8:BOOL=TRUE \
-      -D GRASS_PREFIX8=`pkg-config --variable=prefix grass` \
+      -D WITH_GRASS7:BOOL=TRUE \
+      -D GRASS_PREFIX7=%{grass7_prefix} \
      -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
-      -D BUILD_TESTING:BOOL=FALSE \
+      -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
      -D ENABLE_TESTS:BOOL=FALSE \
-      -D WITH_EPT:BOOL=TRUE \
-      -D WITH_PDAL:BOOL=TRUE \
      -D WITH_QSPATIALITE:BOOL=TRUE \
      -D WITH_QWTPOLAR:BOOL=TRUE \
-      -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
      -D WITH_SERVER:BOOL=TRUE \
      -D WITH_3D:BOOL=TRUE \
-      -D WITH_QSPATIALITE:BOOL=TRUE \
-      -D WITH_SERVER_LANDINGPAGE_WEBAPP=ON \
-      -G Ninja
-export YARN_CACHE_FOLDER="$PWD/.package-cache"
+      -D WITH_QSPATIALITE:BOOL=TRUE
 %cmake_build


@ -213,7 +198,7 @@ desktop-file-edit \

 # Install MIME type definitions
 install -d %{buildroot}%{_datadir}/mime/packages
-install -pm0644 rpm/sources/qgis-mime.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml
+install -pm0644 %{SOURCE5} %{buildroot}%{_datadir}/mime/packages/%{name}.xml

 install -pd %{buildroot}%{_datadir}/pixmaps
 install -pm0644 images/icons/%{name}-icon-512x512.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
@ -222,14 +207,15 @@ install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixma

 # Install basic QGIS Mapserver configuration for Apache
 install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -pm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf
+install -pm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/qgis-server.conf
+
+# See qgis-server-README.fedora
+rm -f %{buildroot}%{_libexecdir}/%{name}/wms_metadata.xml
+rm -f %{buildroot}%{_libexecdir}/%{name}/admin.sld

 # Remove install instructions
 rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL*

-# Drop static library
-rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
-
 %find_lang %{name} --with-qt


@ -241,13 +227,13 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a


 %files -f %{name}.lang
-%license COPYING %{name}-%{version}-vendor-licenses.txt
+%license COPYING
 %doc BUGS NEWS.md README.md Exception_to_GPL_for_Qt.txt ChangeLog.gz
 # QGIS shows the following files in the GUI, including the license text
 %doc %{_datadir}/%{name}/doc/
 %dir %{_datadir}/%{name}/i18n/
-%{_datadir}/%{name}/i18n/qgis_zh-Hans.qm
-%{_datadir}/%{name}/i18n/qgis_zh-Hant.qm
+%lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
+%lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm
 %{_libdir}/lib%{name}_native.so.*
 %{_libdir}/lib%{name}_app.so.*
 %{_libdir}/lib%{name}_analysis.so.*
@ -270,12 +256,11 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
 %{_datadir}/%{name}/resources/
 %{_datadir}/%{name}/svg/
 %exclude %{_libdir}/libqgisgrass*.so.*
-%exclude %{_libdir}/%{name}/plugins/libplugin_grass8.so
-%exclude %{_libdir}/%{name}/plugins/libprovider_grass8.so
-%exclude %{_libdir}/%{name}/plugins/libprovider_grassraster8.so
+%exclude %{_libdir}/%{name}/plugins/libgrassprovider*.so
+%exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
+%exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so
 %exclude %{_libdir}/%{name}/server/
 %exclude %{_libdir}/%{name}/grass/
-%exclude %{_datadir}/%{name}/resources/server/

 %files devel
 %{_datadir}/%{name}/FindQGIS.cmake
@ -285,9 +270,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a

 %files grass
 %{_libdir}/lib%{name}grass*.so.*
-%{_libdir}/%{name}/plugins/libplugin_grass8.so
-%{_libdir}/%{name}/plugins/libprovider_grass8.so
-%{_libdir}/%{name}/plugins/libprovider_grassraster8.so
+%{_libdir}/%{name}/plugins/libgrassprovider*.so
+%{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
+%{_libdir}/%{name}/plugins/libgrassplugin*.so
 %{_libdir}/%{name}/grass/
 %{_datadir}/%{name}/grass/

@ -300,7 +285,7 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
 %exclude %{python3_sitearch}/%{name}/_server.so

 %files server
-%doc %{name}-server-README.fedora
+%doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
 %{_bindir}/qgis_mapserver
 %{_libdir}/%{name}/server/
@ -308,405 +293,12 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
 %{_libexecdir}/%{name}/
 %{python3_sitearch}/%{name}/server/
 %{python3_sitearch}/%{name}/_server.so
-%{_datadir}/%{name}/resources/server/


 %changelog
-* Tue Jan 13 2026 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 3.44.6-2
- Drop support for i686
-
-* Sat Dec 20 2025 Sandro Mani <manisandro@gmail.com> - 3.44.6-1
- Update to 3.44.6
-
-* Tue Nov 25 2025 Sandro Mani <manisandro@gmail.com> - 3.44.5-2
- Rebuild (gdal)
-
-* Fri Nov 21 2025 Sandro Mani <manisandro@gmail.com> - 3.44.5-1
- Update to 3.44.5
-
-* Fri Oct 24 2025 Sandro Mani <manisandro@gmail.com> - 3.44.4-1
- Update to 3.44.4
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.44.3-2
- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Sep 12 2025 Sandro Mani <manisandro@gmail.com> - 3.44.3-1
- Update to 3.44.3
-
-* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 3.44.2-2
- Rebuild for netcdf 4.9.3 soname bump
-
-* Fri Aug 15 2025 Sandro Mani <manisandro@gmail.com> - 3.44.2-1
- Update to 3.44.2
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 3.44.1-6
- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Sun Aug 03 2025 Sandro Mani <manisandro@gmail.com> - 3.44.1-5
- Rebuild (PDAL)
-
-* Sun Aug 03 2025 Sandro Mani <manisandro@gmail.com> - 3.44.1-4
- Rebuild (PDAL)
-
-* Wed Jul 30 2025 Sandro Mani <manisandro@gmail.com> - 3.44.1-3
- Rebuild (GDAL)
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.44.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jul 20 2025 Sandro Mani <manisandro@gmail.com> - 3.44.1-1
- Update to 3.44.1
-
-* Fri Jun 20 2025 Sandro Mani <manisandro@gmail.com> - 3.44.0-1
- Update to 3.44.0
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 3.42.3-3
- Rebuilt for Python 3.14
-
-* Fri May 30 2025 Sandro Mani <manisandro@gmail.com> - 3.42.3-2
- Fix incorrectly installed mime definitions
-
-* Fri May 16 2025 Sandro Mani <manisandro@gmail.com> - 3.42.3-1
- Update to 3.42.3
-
-* Fri Apr 18 2025 Sandro Mani <manisandro@gmail.com> - 3.42.2-1
- Update to 3.42.2
-
-* Sun Mar 23 2025 Sandro Mani <manisandro@gmail.com> - 3.42.1-2
- Fix CVE-2024-55565
-
-* Fri Mar 21 2025 Sandro Mani <manisandro@gmail.com> - 3.42.1-1
- Update to 3.42.1
-
-* Tue Mar 18 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 3.42.0-3
- Rebuilt for spatialindex 2.1.0
- Work around removal of LIB_SUFFIX from cmake macro in Fedora 43
-
-* Sun Mar 02 2025 Sandro Mani <manisandro@gmail.com> - 3.42.0-2
- Rebuild (grass)
-
-* Sat Feb 22 2025 Sandro Mani <manisandro@gmail.com> - 3.42.0-1
- Update to 3.42.0
-
-* Sun Feb 02 2025 Orion Poplawski <orion@nwra.com> - 3.40.3-4
- Rebuild with gsl 2.8
-
-* Sun Feb 02 2025 Sandro Mani <manisandro@gmail.com> - 3.40.3-3
- Drop requires: python3-qt5-webkit
-
-* Fri Jan 31 2025 Sandro Mani <manisandro@gmail.com> - 3.40.3-2
- Rebuild for dropped python-qt5-webkit
-
-* Tue Jan 21 2025 Sandro Mani <manisandro@gmail.com> - 3.40.3-1
- Update to 3.40.3
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.40.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Dec 21 2024 Sandro Mani <manisandro@gmail.com> - 3.40.2-1
- Update to 3.40.2
-
-* Fri Nov 22 2024 Sandro Mani <manisandro@gmail.com> - 3.40.1-1
- Update to 3.40.1
-
-* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 3.40.0-3
- Rebuild (GDAL)
-
-* Fri Oct 25 2024 Orion Poplawski <orion@nwra.com> - 3.40.0-2
- Rebuild for hdf5 1.14.5
-
-* Fri Oct 25 2024 Sandro Mani <manisandro@gmail.com> - 3.40.0-1
- Update to 3.40.0
-
-* Sat Sep 14 2024 Sandro Mani <manisandro@gmail.com> - 3.38.3-1
- Update to 3.38.3
-
-* Mon Sep 09 2024 Sandro Mani <manisandro@gmail.com> - 3.38.2-2
- Rebuild (PDAL)
-
-* Sat Aug 17 2024 Sandro Mani <manisandro@gmail.com> - 3.38.2-1
- Update to 3.38.2
-
-* Tue Jul 30 2024 Sandro Mani <manisandro@gmail.com> - 3.38.1-2
- Rebuild (grass)
-
-* Sat Jul 20 2024 Sandro Mani <manisandro@gmail.com> - 3.38.1-1
- Update to 3.38.1
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Mon Jul 01 2024 Robert-André Mauchin <zebob.m@gmail.com> - 3.38.0-2
- Rebuild for exiv2 0.28.2
-
-* Sat Jun 22 2024 Sandro Mani <manisandro@gmail.com> - 3.38.0-1
- Update to 3.38.0
-
-* Sun Jun 16 2024 Robert-André Mauchin <zebob.m@gmail.com> - 3.36.3-3
- Rebuilt for exiv2 0.28.2
-
-* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.36.3-2
- Rebuilt for Python 3.13
-
-* Sat May 18 2024 Sandro Mani <manisandro@gmail.com> - 3.36.3-1
- Update to 3.36.3
-
-* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 3.36.2-2
- Rebuild (gdal)
-
-* Sat Apr 20 2024 Sandro Mani <manisandro@gmail.com> - 3.36.2-1
- Update to 3.36.2
-
-* Fri Mar 22 2024 Sandro Mani <manisandro@gmail.com> - 3.36.1-1
- Update to 3.36.1
-
-* Tue Mar 19 2024 Sandro Mani <manisandro@gmail.com> - 3.36.0-2
- Rebuild (PDAL)
-
-* Fri Feb 23 2024 Sandro Mani <manisandro@gmail.com> - 3.36.0-1
- Update to 3.36.0
-
-* Tue Jan 23 2024 Sandro Mani <manisandro@gmail.com> - 3.34.3-2
- Rebuild (libdraco)
-
-* Sun Jan 21 2024 Sandro Mani <manisandro@gmail.com> - 3.34.3-1
- Update to 3.34.3
-
-* Sat Dec 23 2023 Sandro Mani <manisandro@gmail.com> - 3.34.2-1
- Update to 3.34.2
-
-* Sun Nov 26 2023 Sandro Mani <manisandro@gmail.com> - 3.34.1-1
- Update to 3.34.1
-
-* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 3.34.0-4
- Rebuild (gdal)
-
-* Fri Nov 03 2023 Sandro Mani <manisandro@gmail.com> - 3.34.0-3
- Add supplements qgis to python3-qgis subpackage
-
-* Sat Oct 28 2023 Sandro Mani <manisandro@gmail.com> - 3.34.0-2
- Rebuild (grass)
-
-* Fri Oct 27 2023 Sandro Mani <manisandro@gmail.com> - 3.34.0-1
- Update to 3.34.0
-
-* Sun Oct 15 2023 Sandro Mani <manisandro@gmail.com> - 3.32.3-2
- Rebuild (PDAL)
-
-* Mon Sep 18 2023 Sandro Mani <manisandro@gmail.com> - 3.32.3-1
- Update to 3.32.3
-
-* Sat Aug 19 2023 Sandro Mani <manisandro@gmail.com> - 3.32.2-1
- Update to 3.32.2
-
-* Tue Aug 15 2023 Sandro Mani <manisandro@gmail.com> - 3.32.1-2
- Rebuild (libspatialite)
-
-* Tue Jul 25 2023 Sandro Mani <manisandro@gmail.com> - 3.32.1-1
- Update to 3.32.1
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jun 26 2023 Sandro Mani <manisandro@gmail.com> - 3.32.0-1
- Update to 3.32.0
-
-* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 3.30.3-2
- Rebuilt for Python 3.12
-
-* Fri May 26 2023 Sandro Mani <manisandro@gmail.com> - 3.30.3-1
- Update to 3.30.3
-
-* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 3.30.2-2
- Rebuild (gdal)
-
-* Sun Apr 30 2023 Sandro Mani <manisandro@gmail.com> - 3.30.2-1
- Update to 3.30.2
-
-* Fri Mar 31 2023 Sandro Mani <manisandro@gmail.com> - 3.30.1-1
- Update to 3.30.1
-
-* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 3.30.0-1
- Update to 3.30.0
-
-* Fri Jan 27 2023 Sandro Mani <manisandro@gmail.com> - 3.28.3-1
- Update to 3.28.3
-
-* Sun Jan 22 2023 Sandro Mani <manisandro@gmail.com> - 3.28.2-4
- Rebuild (PDAL)
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Dec 21 2022 Sandro Mani <manisandro@gmail.com> - 3.28.2-2
- Rebuild (qwt)
-
-* Fri Dec 16 2022 Sandro Mani <manisandro@gmail.com> - 3.28.2-1
- Update to 3.28.2
-
-* Fri Nov 18 2022 Sandro Mani <manisandro@gmail.com> - 3.28.1-1
- Update to 3.28.1
-
-* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 3.28.0-2
- Rebuild (gdal)
-
-* Tue Oct 25 2022 Sandro Mani <manisandro@gmail.com> - 3.28.0-1
- Update to 3.28.0
-
-* Sat Sep 10 2022 Sandro Mani <manisandro@gmail.com> - 3.26.3-1
- Update to 3.26.3
-
-* Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.26.2-2
- Rebuild for gsl-2.7.1
-
-* Sat Aug 13 2022 Sandro Mani <manisandro@gmail.com> - 3.26.2-1
- Update to 3.26.2
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.26.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Sandro Mani <manisandro@gmail.com> - 3.26.1-1
- Update to 3.26.1
-
-* Thu Jul 14 2022 Jan Grulich <jgrulich@redhat.com> - 3.26.0-4
- Rebuild (qt5)
-
-* Mon Jul 04 2022 Sandro Mani <manisandro@gmail.com> - 3.26.0-3
- Rebuild (grass)
-
-* Fri Jun 17 2022 Python Maint <python-maint@redhat.com> - 3.26.0-2
- Rebuilt for Python 3.11
-
-* Fri Jun 17 2022 Sandro Mani <manisandro@gmail.com> - 3.26.0-1
- Update to 3.26.0
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.24.3-4
- Rebuilt for Python 3.11
-
-* Sun Jun 05 2022 Sandro Mani <manisandro@gmail.com> - 3.24.3-3
- Rebuild (grass)
-
-* Mon May 23 2022 Sandro Mani <manisandro@gmail.com> - 3.24.3-2
- Fix python3-gdal requires
-
-* Sun May 22 2022 Sandro Mani <manisandro@gmail.com> - 3.24.3-1
- Update to 3.24.3
- Enable PDAL support
-
-* Sat May 21 2022 Sandro Mani <manisandro@gmail.com> - 3.24.2-3
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
-
-* Tue May 17 2022 Jan Grulich <jgrulich@redhat.com> - 3.24.2-2
- Rebuild (qt5)
-
-* Sat Apr 16 2022 Sandro Mani <manisandro@gmail.com> - 3.24.2-1
- Update to 3.24.2
-
-* Mon Mar 21 2022 Sandro Mani <manisandro@gmail.com> - 3.24.1-1
- Update to 3.24.1
-
-* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 3.24.0-3
- Rebuild for proj-9.0.0
-
-* Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 3.24.0-2
- Rebuild (qt5)
-
-* Fri Feb 18 2022 Sandro Mani <manisandro@gmail.com> - 3.24.0-1
- Update to 3.24.0
-
-* Wed Feb 09 2022 Sandro Mani <manisandro@gmail.com> - 3.22.3-6
- Drop common image raster formats from qgis-mime.xml
-
-* Mon Feb 07 2022 Sandro Mani <manisandro@gmail.com> - 3.22.3-5
- Workaround linking against libgrass_imagery.8.0.so
-
-* Wed Feb 02 2022 Sandro Mani <manisandro@gmail.com> - 3.22.3-4
- Update qgis-grass8.patch
-
-* Sun Jan 30 2022 Sandro Mani <manisandro@gmail.com> - 3.22.3-3
- Rebuild (grass)
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Jan 18 2022 Sandro Mani <manisandro@gmail.com> - 3.22.3-1
- Update to 3.22.3
-
-* Wed Jan 12 2022 Sandro Mani <manisandro@gmail.com> - 3.22.2-3
- Update qgis-mime.xml
-
-* Wed Jan 05 2022 Sandro Mani <manisandro@gmail.com> - 3.22.2-2
- Disable landingpage
-
-* Fri Dec 17 2021 Sandro Mani <manisandro@gmail.com> - 3.22.2-1
- Update to 3.22.2
-
-* Mon Nov 22 2021 Orion Poplawski <orion@nwra.com> - 3.22.1-2
- Rebuild for hdf5 1.12.1
-
-* Sat Nov 20 2021 Sandro Mani <manisandro@gmail.com> - 3.22.1-1
- Update to 3.22.1
-
-* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 3.22.0-7
- Rebuild (gdal)
-
-* Sat Nov 06 2021 Adrian Reber <adrian@lisas.de> - 3.22.0-6
- Rebuilt for protobuf 3.19.0
-
-* Wed Nov 03 2021 Sandro Mani <manisandro@gmail.com> - 3.22.0-5
- Backport fix for GIL deadlock
-
-* Mon Oct 25 2021 Sandro Mani <manisandro@gmail.com> - 3.22.0-4
- Move grass provider plugins to grass subpackage
-
-* Mon Oct 25 2021 Adrian Reber <adrian@lisas.de> - 3.22.0-2
- Rebuilt for protobuf 3.18.1
-
-* Sat Oct 23 2021 Sandro Mani <manisandro@gmail.com> - 3.22.0-1
- Update to 3.22.0
-
-* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 3.20.3-2
- Rebuild (geos)
-
-* Mon Sep 13 2021 Sandro Mani <manisandro@gmail.com> - 3.20.3-1
- Update to 3.20.3
-
-* Mon Aug 16 2021 Orion Poplawski <orion@nwra.com> - 3.20.2-2
- Rebuild for netcdf 4.8.0 (again)
-
-* Sat Aug 14 2021 Sandro Mani <manisandro@gmail.com> - 3.20.2-1
- Update to 3.20.2
-
-* Wed Aug 11 2021 Orion Poplawski <orion@nwra.com> - 3.20.1-3
- Rebuild for netcdf 4.8.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jul 21 2021 Sandro Mani <manisandro@gmail.com> - 3.20.1-1
- Update to 3.20.1
-
-* Tue Jul 20 2021 Sandro Mani <manisandro@gmail.com> - 3.20.0-1
- Update to 3.20.0
-
-* Sat Jul 10 2021 Scott Talbert <swt@techie.net> - 3.18.3-5
- Revert back to building with sip 4 due to no sip 6 support
-
-* Tue Jun 08 2021 Scott Talbert <swt@techie.net> - 3.18.3-4
- Update to build with sip5+
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.18.3-3
- Rebuilt for Python 3.10
-
-* Fri May 21 2021 Sandro Mani <manisandro@gmail.com> - 3.18.3-2
- Rebuild (gdal)
-
 * Sun May 16 2021 Sandro Mani <manisandro@gmail.com> - 3.18.3-1
 - Update to 3.18.3

-* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 3.18.2-2
- Rebuild (gdal)
-
 * Sat Apr 17 2021 Sandro Mani <manisandro@gmail.com> - 3.18.2-1
 - Update to 3.18.2

@ -716,8 +308,8 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
 * Wed Mar 24 2021 sandro Mani <manisandro@gmail.com> - 3.18.1-1
 - Update to 3.18.1

-* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.18.0-2
- Rebuild (proj)
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 3.18.0-2
+- Rebuilt for removed libstdc++ symbol (#1937698)

 * Fri Feb 19 2021 Sandro Mani <manisandro@gmail.com> - 3.18.0-1
 - Update to 3.18.0
--- a/qgis_proj8.patch
+++ b/qgis_proj8.patch
@ -0,0 +1,16 @@
+diff -rupN qgis-3.18.1/cmake/FindProj.cmake qgis-3.18.1-new/cmake/FindProj.cmake
+--- qgis-3.18.1/cmake/FindProj.cmake	2021-03-19 13:09:08.000000000 +0100
+++ qgis-3.18.1-new/cmake/FindProj.cmake	2021-03-24 10:05:30.492088939 +0100
+@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
+   "$ENV{INCLUDE}"
+   "$ENV{LIB_DIR}/include"
+   )
+IF (NOT PROJ_INCLUDE_DIR)
+  FIND_PATH(PROJ_INCLUDE_DIR proj.h
+    "$ENV{INCLUDE}"
+    "$ENV{LIB_DIR}/include"
+    )
+ENDIF (NOT PROJ_INCLUDE_DIR)
+ 
+ FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS
+   "$ENV{LIB}"
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (qgis-3.44.6.tar.bz2) = 7ab868fb214f571b7feac5172a4c60b1bba617df3cf55a6a3167b6ca87737be5fddec94155d3f0ec8ce0ca9efba19ee719d33ee3fba851c9fae6db409bf86f85
-SHA512 (qgis-3.44.6-vendor.tar.xz) = 04f711a21a75e06c2f327cb542b4b50cae8f6f2db5817173ffaf9057d2bd81c596fd067bf8cc4952f9d0bdc04e3b389d7dd3c8d8928c767975dab884f0f1705a
+SHA512 (qgis-3.18.3.tar.bz2) = d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
Author	SHA1	Message	Date
Sandro Mani	5a540951b9	Update to 3.18.3	2021-05-16 10:13:44 +02:00
Sandro Mani	5cea18a5cf	Update to 3.18.2	2021-04-17 10:22:42 +02:00
Jonathan Wakely	d56c88303c	Rebuilt for removed libstdc++ symbols (#1937698 )	2021-04-17 10:22:42 +02:00
Sandro Mani	c98321069c	Re-add qgis_proj8.patch	2021-04-17 10:22:42 +02:00
Sandro Mani	07e94685a4	BR: libxml2-devel	2021-04-17 10:22:42 +02:00
Sandro Mani	2c109a95d8	Update to 3.18.1	2021-04-17 10:22:41 +02:00
Sandro Mani	dd4132e55b	Update qgis_proj8.patch	2021-04-17 10:22:19 +02:00
Sandro Mani	101dafd58f	Add qgis_proj8.patch	2021-04-17 10:22:19 +02:00
Jonathan Wakely	f7613e7827	Rebuilt for removed libstdc++ symbol (#1937698 )	2021-03-30 19:39:29 +01:00