From cbdab6e090298da38bf13c6009f4dd4544fab7a8a34a97316af2cfa907fcb206 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 14 Dec 2022 14:08:21 +0000 Subject: [PATCH 1/3] Accepting request 1042004 from home:notrub:branches:Application:Geo - Update to 3.28.1 (2nd release after 3.24.1, skipping 3.26). OpenSuSE "Official" version has fallen some way behind upstream feature releases. Requirement for Python 3.7 is not met in 15.4, but works for Tumbleweed. https://changelog.qgis.org/en/qgis/version/3.28/ https://changelog.qgis.org/en/qgis/version/3.26/ OBS-URL: https://build.opensuse.org/request/show/1042004 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=356 --- _service | 7 +++++++ _service:download_files:qgis-3.28.1.tar.bz2 | 3 +++ _service:download_files:qgis-3.28.1.tar.bz2.sha256 | 1 + _service:download_url:qgis-3.28.1.tar.bz2 | 3 +++ qgis-3.24.1.tar.bz2 | 3 --- qgis-3.24.1.tar.bz2.sha256 | 1 - qgis.changes | 7 +++++++ qgis.spec | 10 +++++----- 8 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 _service create mode 100644 _service:download_files:qgis-3.28.1.tar.bz2 create mode 100644 _service:download_files:qgis-3.28.1.tar.bz2.sha256 create mode 100644 _service:download_url:qgis-3.28.1.tar.bz2 delete mode 100644 qgis-3.24.1.tar.bz2 delete mode 100644 qgis-3.24.1.tar.bz2.sha256 diff --git a/_service b/_service new file mode 100644 index 0000000..3a2200f --- /dev/null +++ b/_service @@ -0,0 +1,7 @@ + + + download.qgis.org + https + /downloads/qgis-3.28.1.tar.bz2 + + \ No newline at end of file diff --git a/_service:download_files:qgis-3.28.1.tar.bz2 b/_service:download_files:qgis-3.28.1.tar.bz2 new file mode 100644 index 0000000..3a18ef7 --- /dev/null +++ b/_service:download_files:qgis-3.28.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 +size 158612624 diff --git a/_service:download_files:qgis-3.28.1.tar.bz2.sha256 b/_service:download_files:qgis-3.28.1.tar.bz2.sha256 new file mode 100644 index 0000000..d95ab8c --- /dev/null +++ b/_service:download_files:qgis-3.28.1.tar.bz2.sha256 @@ -0,0 +1 @@ +09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 qgis-3.28.1.tar.bz2 diff --git a/_service:download_url:qgis-3.28.1.tar.bz2 b/_service:download_url:qgis-3.28.1.tar.bz2 new file mode 100644 index 0000000..3a18ef7 --- /dev/null +++ b/_service:download_url:qgis-3.28.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 +size 158612624 diff --git a/qgis-3.24.1.tar.bz2 b/qgis-3.24.1.tar.bz2 deleted file mode 100644 index 979343d..0000000 --- a/qgis-3.24.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20cc5c47fb9463e82c72ac77122b77849f04f6fb64314ac5fe6d0069dd0d5c11 -size 139671856 diff --git a/qgis-3.24.1.tar.bz2.sha256 b/qgis-3.24.1.tar.bz2.sha256 deleted file mode 100644 index cb316b6..0000000 --- a/qgis-3.24.1.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -20cc5c47fb9463e82c72ac77122b77849f04f6fb64314ac5fe6d0069dd0d5c11 qgis-3.24.1.tar.bz2 diff --git a/qgis.changes b/qgis.changes index 508bffa..9bd7317 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 10 12:15:32 UTC 2022 - Craig Burton + +- Update to 3.28.1 (2nd release after 3.24.1, skipping 3.26) + https://changelog.qgis.org/en/qgis/version/3.28/ + https://changelog.qgis.org/en/qgis/version/3.26/ + ------------------------------------------------------------------- Mon Oct 3 11:28:43 UTC 2022 - Dirk Stoecker diff --git a/qgis.spec b/qgis.spec index 10a300d..c6cdcbd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis-ltr %else Name: qgis %endif -Version: 3.24.1 +Version: 3.28.1 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only @@ -40,11 +40,11 @@ Patch2: qgis-fix-cmake-findpdal.patch BuildRequires: FastCGI-devel BuildRequires: PDAL-devel BuildRequires: bison >= 2.4 -BuildRequires: cmake >= 3.0.0 +BuildRequires: cmake >= 3.12.0 BuildRequires: fdupes BuildRequires: filesystem BuildRequires: flex >= 2.5.6 -BuildRequires: geos-devel >= 3.4 +BuildRequires: geos-devel >= 3.9 BuildRequires: libQt5Sql-private-headers-devel BuildRequires: libQt5Sql5-mysql BuildRequires: libQt5Sql5-postgresql @@ -108,13 +108,13 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(expat) >= 1.95 # Requires at least gdal 3.1 for GeoTIFF and Proj >= 6 - https://github.com/qgis/QGIS/issues/36699#issuecomment-633539864 -BuildRequires: pkgconfig(gdal) >= 3.1 +BuildRequires: pkgconfig(gdal) >= 3.2.0 BuildRequires: pkgconfig(Qt5Qwt6) BuildRequires: pkgconfig(gsl) >= 1.8 BuildRequires: pkgconfig(libpq) > 9.4 BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(pdal) >= 2.2.0 -BuildRequires: pkgconfig(proj) >= 6.3.1 +BuildRequires: pkgconfig(proj) >= 7.2.0 BuildRequires: pkgconfig(python3) >= 3.7 BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(spatialite) >= 4.2.0 From d0c50383b6eed9691f2a57d0d1e06656cf721e70a453d803104af8b3ba157108 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 4 Jan 2023 15:43:17 +0000 Subject: [PATCH 2/3] drop service OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=357 --- _service | 7 ------- _service:download_url:qgis-3.28.1.tar.bz2 | 3 --- ...wnload_files:qgis-3.28.1.tar.bz2 => qgis-3.28.1.tar.bz2 | 0 ...gis-3.28.1.tar.bz2.sha256 => qgis-3.28.1.tar.bz2.sha256 | 0 qgis.spec | 4 ++-- 5 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 _service delete mode 100644 _service:download_url:qgis-3.28.1.tar.bz2 rename _service:download_files:qgis-3.28.1.tar.bz2 => qgis-3.28.1.tar.bz2 (100%) rename _service:download_files:qgis-3.28.1.tar.bz2.sha256 => qgis-3.28.1.tar.bz2.sha256 (100%) diff --git a/_service b/_service deleted file mode 100644 index 3a2200f..0000000 --- a/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - download.qgis.org - https - /downloads/qgis-3.28.1.tar.bz2 - - \ No newline at end of file diff --git a/_service:download_url:qgis-3.28.1.tar.bz2 b/_service:download_url:qgis-3.28.1.tar.bz2 deleted file mode 100644 index 3a18ef7..0000000 --- a/_service:download_url:qgis-3.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 -size 158612624 diff --git a/_service:download_files:qgis-3.28.1.tar.bz2 b/qgis-3.28.1.tar.bz2 similarity index 100% rename from _service:download_files:qgis-3.28.1.tar.bz2 rename to qgis-3.28.1.tar.bz2 diff --git a/_service:download_files:qgis-3.28.1.tar.bz2.sha256 b/qgis-3.28.1.tar.bz2.sha256 similarity index 100% rename from _service:download_files:qgis-3.28.1.tar.bz2.sha256 rename to qgis-3.28.1.tar.bz2.sha256 diff --git a/qgis.spec b/qgis.spec index c6cdcbd..762c6cb 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ # # spec file for package qgis-ltr # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -127,11 +127,11 @@ Requires: proj Requires: pdal Requires: python3-GDAL Requires: python3-Jinja2 -Requires: python3-numpy Requires: python3-OWSLib Requires: python3-PyYAML Requires: python3-Pygments Requires: python3-future +Requires: python3-numpy Requires: python3-psycopg2 # Those are not picked by obs Requires: python3-qscintilla-qt5 From f6d64553192ce06711f25a2a4477df130a2c89ffe7f3e91f826afcfc98e6504c Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 4 Jan 2023 16:21:32 +0000 Subject: [PATCH 3/3] Update to bugfix-release 3.28.2 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=358 --- qgis-3.28.1.tar.bz2 | 3 --- qgis-3.28.1.tar.bz2.sha256 | 1 - qgis-3.28.2.tar.bz2 | 3 +++ qgis-3.28.2.tar.bz2.sha256 | 1 + qgis.changes | 5 +++++ qgis.spec | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 qgis-3.28.1.tar.bz2 delete mode 100644 qgis-3.28.1.tar.bz2.sha256 create mode 100644 qgis-3.28.2.tar.bz2 create mode 100644 qgis-3.28.2.tar.bz2.sha256 diff --git a/qgis-3.28.1.tar.bz2 b/qgis-3.28.1.tar.bz2 deleted file mode 100644 index 3a18ef7..0000000 --- a/qgis-3.28.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 -size 158612624 diff --git a/qgis-3.28.1.tar.bz2.sha256 b/qgis-3.28.1.tar.bz2.sha256 deleted file mode 100644 index d95ab8c..0000000 --- a/qgis-3.28.1.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -09015bb68c45556ffe9d480272d24048e6276a6bf1c010fd77beae64329ff674 qgis-3.28.1.tar.bz2 diff --git a/qgis-3.28.2.tar.bz2 b/qgis-3.28.2.tar.bz2 new file mode 100644 index 0000000..77a1604 --- /dev/null +++ b/qgis-3.28.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5bebe20fc3b9e6cd2b2030176befc0ac51c5ea987dc250b1b543e1dcac81853 +size 158641485 diff --git a/qgis-3.28.2.tar.bz2.sha256 b/qgis-3.28.2.tar.bz2.sha256 new file mode 100644 index 0000000..f330fb5 --- /dev/null +++ b/qgis-3.28.2.tar.bz2.sha256 @@ -0,0 +1 @@ +e5bebe20fc3b9e6cd2b2030176befc0ac51c5ea987dc250b1b543e1dcac81853 qgis-3.28.2.tar.bz2 diff --git a/qgis.changes b/qgis.changes index 9bd7317..4fe90d7 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 4 16:20:48 UTC 2023 - Dirk Stoecker + +- Update to bugfix-release 3.28.2 + ------------------------------------------------------------------- Sat Dec 10 12:15:32 UTC 2022 - Craig Burton diff --git a/qgis.spec b/qgis.spec index 762c6cb..4924ae4 100644 --- a/qgis.spec +++ b/qgis.spec @@ -24,7 +24,7 @@ Name: qgis-ltr %else Name: qgis %endif -Version: 3.28.1 +Version: 3.28.2 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only