diff --git a/.gitignore b/.gitignore index 7096439..b9241fd 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.28.0-vendor-licenses.txt b/qgis-3.28.0-vendor-licenses.txt deleted file mode 100644 index fb28c0c..0000000 --- a/qgis-3.28.0-vendor-licenses.txt +++ /dev/null @@ -1,26 +0,0 @@ -yarn run v1.22.17 -$ /tmpnode_modules/.bin/license-checker --summary -├─ MIT: 1089 -├─ ISC: 77 -├─ BSD-3-Clause: 32 -├─ BSD-2-Clause: 28 -├─ Apache-2.0: 22 -├─ (MIT OR CC0-1.0): 4 -├─ MIT*: 3 -├─ 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.78s. diff --git a/qgis-3.28.1-vendor-licenses.txt b/qgis-3.28.1-vendor-licenses.txt new file mode 100644 index 0000000..9799f9d --- /dev/null +++ b/qgis-3.28.1-vendor-licenses.txt @@ -0,0 +1,26 @@ +yarn run v1.22.17 +$ /tmpnode_modules/.bin/license-checker --summary +├─ MIT: 1089 +├─ ISC: 77 +├─ BSD-3-Clause: 32 +├─ BSD-2-Clause: 28 +├─ Apache-2.0: 22 +├─ (MIT OR CC0-1.0): 4 +├─ MIT*: 3 +├─ 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 3.32s. diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 37f6613..ad92b8f 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference qgis-3.26.1/src/core/qgsapplication.cpp qgis-3.26.1-new/src/core/qgsapplication.cpp ---- qgis-3.26.1/src/core/qgsapplication.cpp 2022-07-15 14:14:09.000000000 +0200 -+++ qgis-3.26.1-new/src/core/qgsapplication.cpp 2022-07-19 15:57:39.650125510 +0200 -@@ -360,6 +360,11 @@ void QgsApplication::init( QString profi +diff -rupN --no-dereference qgis-3.28.1/src/core/qgsapplication.cpp qgis-3.28.1-new/src/core/qgsapplication.cpp +--- qgis-3.28.1/src/core/qgsapplication.cpp 2022-11-18 13:10:21.000000000 +0100 ++++ qgis-3.28.1-new/src/core/qgsapplication.cpp 2022-11-18 22:47:36.864059524 +0100 +@@ -369,6 +369,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); } diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 7a1e576..ac80331 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.26.1/resources/CMakeLists.txt qgis-3.26.1-new/resources/CMakeLists.txt ---- qgis-3.26.1/resources/CMakeLists.txt 2022-07-15 14:14:09.000000000 +0200 -+++ qgis-3.26.1-new/resources/CMakeLists.txt 2022-07-19 15:57:41.443125550 +0200 +diff -rupN --no-dereference qgis-3.28.1/resources/CMakeLists.txt qgis-3.28.1-new/resources/CMakeLists.txt +--- qgis-3.28.1/resources/CMakeLists.txt 2022-11-18 13:10:21.000000000 +0100 ++++ qgis-3.28.1-new/resources/CMakeLists.txt 2022-11-18 22:47:39.354059580 +0100 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 8e23b06..27d8828 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.0 -Release: 2%{?dist} +Version: 3.28.1 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -299,6 +299,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Fri Nov 18 2022 Sandro Mani - 3.28.1-1 +- Update to 3.28.1 + * Sat Nov 12 2022 Sandro Mani - 3.28.0-2 - Rebuild (gdal) diff --git a/sources b/sources index e614150..bba0f5a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.0-vendor.tar.xz) = bb19652034a540444d27fae876686a2613f17ba083ebda2a8764384cd0afc823ca83909ce6ba4353164582dc43d1629e3d364d97c78724239b8e95ea20ad881a -SHA512 (qgis-3.28.0.tar.bz2) = 4189dc75628e8ae89817215905da57a4d91d71964a75a2e1750e4082c1cb61a118446eaa0508aa9db58108b7615ad40ed3233078b933a56fa70edf1933f20afe +SHA512 (qgis-3.28.1.tar.bz2) = f10e67b24abe9881ad447495d144a92ad7aa8f5b826606ce6407f65261ef4521e8b7d2e257079cb11247cdd991afbdf6e49e772649e2d1f5827ceff190caa514 +SHA512 (qgis-3.28.1-vendor.tar.xz) = 22389ef8df481fd9a3c18a285b03824b7e5d2e96fdb27c019dde0b7ea0524f6fa96c3d83703ee65b784e13ecbebab80601914399a156cf5c565e10ce9cab7e62