From 186257eceb28a41ba277109c96404321f2fc3493d0aec3da48b402c679a4dca1 Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Wed, 11 Mar 2020 15:42:32 +0000 Subject: [PATCH 1/3] Accepting request 783024 from home:Guillaume_G:branches:Application:Geo - Update to 3.12.0 OBS-URL: https://build.opensuse.org/request/show/783024 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=293 --- qgis-3.10.2.tar.bz2 | 3 --- qgis-3.10.2.tar.bz2.sha256 | 1 - qgis-3.12.0.tar.bz2 | 3 +++ qgis-3.12.0.tar.bz2.sha256 | 1 + qgis.changes | 5 +++++ qgis.spec | 4 ++-- 6 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 qgis-3.10.2.tar.bz2 delete mode 100644 qgis-3.10.2.tar.bz2.sha256 create mode 100644 qgis-3.12.0.tar.bz2 create mode 100644 qgis-3.12.0.tar.bz2.sha256 diff --git a/qgis-3.10.2.tar.bz2 b/qgis-3.10.2.tar.bz2 deleted file mode 100644 index da3935e..0000000 --- a/qgis-3.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:381cb01a8ac2f5379a915b124e9c830d727d2c67775ec49609c7153fe765a6f7 -size 101916273 diff --git a/qgis-3.10.2.tar.bz2.sha256 b/qgis-3.10.2.tar.bz2.sha256 deleted file mode 100644 index 905e723..0000000 --- a/qgis-3.10.2.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -381cb01a8ac2f5379a915b124e9c830d727d2c67775ec49609c7153fe765a6f7 qgis-3.10.2.tar.bz2 diff --git a/qgis-3.12.0.tar.bz2 b/qgis-3.12.0.tar.bz2 new file mode 100644 index 0000000..0c4c060 --- /dev/null +++ b/qgis-3.12.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19e9c185dfe88cad7ee6e0dcf5ab7b0bbfe1672307868a53bf771e0c8f9d5e9c +size 109184001 diff --git a/qgis-3.12.0.tar.bz2.sha256 b/qgis-3.12.0.tar.bz2.sha256 new file mode 100644 index 0000000..bfa6942 --- /dev/null +++ b/qgis-3.12.0.tar.bz2.sha256 @@ -0,0 +1 @@ +19e9c185dfe88cad7ee6e0dcf5ab7b0bbfe1672307868a53bf771e0c8f9d5e9c qgis-3.12.0.tar.bz2 diff --git a/qgis.changes b/qgis.changes index fdbb647..7e92113 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 9 13:06:49 UTC 2020 - Guillaume GARDET + +- Update to 3.12.0 + ------------------------------------------------------------------- Mon Feb 24 10:54:31 UTC 2020 - Andreas Schwab diff --git a/qgis.spec b/qgis.spec index e92d59a..4b23151 100644 --- a/qgis.spec +++ b/qgis.spec @@ -18,7 +18,7 @@ %bcond_without grass Name: qgis -Version: 3.10.2 +Version: 3.12.0 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only @@ -106,7 +106,7 @@ BuildRequires: pkgconfig(gdal) >= 2.1 BuildRequires: pkgconfig(gsl) >= 1.8 BuildRequires: pkgconfig(libpq) > 9.4 BuildRequires: pkgconfig(libzip) -BuildRequires: pkgconfig(proj) >= 6.0 +BuildRequires: pkgconfig(proj) >= 6.3.1 BuildRequires: pkgconfig(python3) >= 3.4 BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(spatialite) >= 4.2.0 From b4dffb88e37dcf19cd31e1e3ce96450a5b56ac3d92743135280e405a6cb993df Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Wed, 11 Mar 2020 16:15:51 +0000 Subject: [PATCH 2/3] Accepting request 783958 from home:Guillaume_G:branches:Application:Geo Add changelog link OBS-URL: https://build.opensuse.org/request/show/783958 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=294 --- qgis.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qgis.changes b/qgis.changes index 7e92113..1152f18 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Mar 9 13:06:49 UTC 2020 - Guillaume GARDET -- Update to 3.12.0 +- Update to 3.12.0, changes are documented at + https://changelog.qgis.org/en/qgis/version/3.12/ ------------------------------------------------------------------- Mon Feb 24 10:54:31 UTC 2020 - Andreas Schwab From afaaf853f203bfed63520796fd6578883a85af84ffee735c8b45a8b13d17fd96 Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Thu, 12 Mar 2020 15:25:08 +0000 Subject: [PATCH 3/3] Accepting request 784354 from home:Guillaume_G:branches:Application:Geo - Use gdal 3 where possible because of bugs with gdal 2 https://github.com/qgis/QGIS/issues/34933 OBS-URL: https://build.opensuse.org/request/show/784354 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=295 --- qgis.changes | 6 ++++++ qgis.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/qgis.changes b/qgis.changes index 1152f18..66332b9 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 12 13:47:26 UTC 2020 - Guillaume GARDET + +- Use gdal 3 where possible because of bugs with gdal 2 + https://github.com/qgis/QGIS/issues/34933 + ------------------------------------------------------------------- Mon Mar 9 13:06:49 UTC 2020 - Guillaume GARDET diff --git a/qgis.spec b/qgis.spec index 4b23151..933aaa7 100644 --- a/qgis.spec +++ b/qgis.spec @@ -102,7 +102,12 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5XmlPatterns) BuildRequires: pkgconfig(expat) >= 1.95 +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 +# Use gdal 3 where possible because of bugs with gdal 2 - https://github.com/qgis/QGIS/issues/34933 +BuildRequires: pkgconfig(gdal) >= 3 +%else BuildRequires: pkgconfig(gdal) >= 2.1 +%endif BuildRequires: pkgconfig(gsl) >= 1.8 BuildRequires: pkgconfig(libpq) > 9.4 BuildRequires: pkgconfig(libzip)