From eaf16da3768e702ea6710f934b0797b64df6585b3ba45185738a72ea8827ffbc Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Mon, 11 Sep 2023 18:17:23 +0000 Subject: [PATCH] Accepting request 1108396 from home:bruno_friedmann:branches:Application:Geo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Please review carefully the new requirements. The bundled zlib has specific patches and entries for gdal. I don't want to touch this critical component. - update to bugfix release version 3.7.1 * see https://github.com/OSGeo/gdal/blob/v3.7.1/NEWS.md - update to feature release version 3.7.0 + see https://github.com/OSGeo/gdal/blob/v3.7.0/NEWS.md - packaging: * add new buildrequire pkgconfig(libarchive) for new /vsi7z/ and /vsirar/ virtual file systems * handle new delivered files data/gfs.xsd: XML schema for .gfs files (#6655) data/gml_registry.xsd: new file with XML schema of gml_registry.xml (#6716) data/ogrinfo_output.json.schema: validate ogrinfo -json output data/gdalinfo_output.schema.json: validate gdalinfo -json output (fixes #6850) data/grib2_table_4_2_0_21.csv data/grib2_table_4_2_2_6.csv bin/sozip * spec-cleaner * remove limitation for python < 3.11 as Factory has 3.11.4 old: Application:Geo/gdal new: home:bruno_friedmann:branches:Application:Geo/gdal rev None Index: gdal.changes =================================================================== --- gdal.changes (revision 168) +++ gdal.changes (revision 3) @@ -1,7 +1,30 @@ ------------------------------------------------------------------- +Mon Aug 21 19:11:24 UTC 2023 - Bruno Friedmann + +- update to bugfix release version 3.7.1 + * see https://github.com/OSGeo/gdal/blob/v3.7.1/NEWS.md +- update to feature release version 3.7.0 + + see https://github.com/OSGeo/gdal/blob/v3.7.0/NEWS.md +- packaging: + * add new buildrequire pkgconfig(libarchive) + for new /vsi7z/ and /vsirar/ virtual file systems + * handle new delivered files + data/gfs.xsd: XML schema for .gfs files (#6655) + data/gml_registry.xsd: new file with XML schema of + gml_registry.xml (#6716) + data/ogrinfo_output.json.schema: validate ogrinfo -json output + data/gdalinfo_output.schema.json: validate gdalinfo -json + output (fixes #6850) + data/grib2_table_4_2_0_21.csv + data/grib2_table_4_2_2_6.csv + bin/sozip + * spec-cleaner + * remove limitation for python < 3.11 as Factory has 3.11.4 + +------------------------------------------------------------------- Fri May 26 12:18:37 UTC 2023 - Boris Manojlovic -- add required development rpms +- add required development rpms ------------------------------------------------------------------- Fri Mar 17 16:37:12 UTC 2023 - Dirk Müller @@ -20,20 +43,20 @@ Thu Dec 15 16:17:22 UTC 2022 - Bruno Friedmann - Update to bugfix 3.6.1 (critical) - Important: GDAL 3.6.1 officially retracts GDAL 3.6.0 + Important: GDAL 3.6.1 officially retracts GDAL 3.6.0 which cause corruption of the spatial index of GeoPackage files - it created (in tables with 100 000 features or more): cf - https://github.com/qgis/QGIS/issues/51188 and - https://github.com/OSGeo/gdal/pull/6911. - GDAL 3.6.1 fixes that issue. + it created (in tables with 100 000 features or more): cf + https://github.com/qgis/QGIS/issues/51188 and + https://github.com/OSGeo/gdal/pull/6911. + GDAL 3.6.1 fixes that issue. Setting OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable (at generation time) also works around the issue with GDAL 3.6.0. - Users who have generated corrupted GeoPackage files with 3.6.0 - can regnerate them with 3.6.1 with: - "ogr2ogr out_ok.gpkg in_corrupted.gpkg" + Users who have generated corrupted GeoPackage files with 3.6.0 + can regnerate them with 3.6.1 with: + "ogr2ogr out_ok.gpkg in_corrupted.gpkg" (assuming a GeoPackage file with vector content only) Consult the release notes for the list of issues addressed : - https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md + https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md ------------------------------------------------------------------- Sat Nov 26 19:19:19 UTC 2022 - Bruno Friedmann Index: gdal.spec =================================================================== --- gdal.spec (revision 168) +++ gdal.spec (revision 3) @@ -16,7 +16,7 @@ # -%define soversion 32 +%define soversion 33 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL @@ -31,7 +31,7 @@ %bcond_with deflate_support %bcond_with tests_support Name: gdal -Version: 3.6.3 +Version: 3.7.1 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: BSD-3-Clause AND MIT AND SUSE-Public-Domain @@ -64,6 +64,8 @@ BuildRequires: mysql-devel BuildRequires: pcre2-devel BuildRequires: pkgconfig +BuildRequires: python3-base +BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools %if 0%{?sle_version} == 150300 && 0%{?is_opensuse} @@ -89,6 +91,7 @@ BuildRequires: pkgconfig(freexl) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libgeotiff) >= 1.2.1 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblz4) @@ -195,7 +198,8 @@ # Prepare tests tar -xf %{S:2} # Delete bundled libraries -rm -rv frmts/zlib +# keep zlib due to missing frmts/zlib/contrib/infback9 in our package +# rm -rv frmts/zlib rm -rv frmts/png/libpng rm -rv frmts/gif/giflib rm -rv frmts/jpeg/libjpeg @@ -363,6 +367,7 @@ %{_bindir}/ogrinfo %{_bindir}/ogrlineref %{_bindir}/ogrtindex +%{_bindir}/sozip %{_datadir}/gdal %{_mandir}/man1/gdal_contour.1%{?ext_man} %{_mandir}/man1/gdal_create.1%{?ext_man} @@ -388,6 +393,7 @@ %{_mandir}/man1/ogrinfo.1%{?ext_man} %{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man} +%{_mandir}/man1/sozip.1%{?ext_man} # 20201104 We keep all binaries in gdal and requires python3-GDAL %{_bindir}/gdalattachpct.py %{_bindir}/gdal2tiles.py Index: gdal-3.7.1.tar.xz =================================================================== Binary file gdal-3.7.1.tar.xz (revision 3) added Index: gdal-3.7.1.tar.xz.md5 =================================================================== --- gdal-3.7.1.tar.xz.md5 (added) +++ gdal-3.7.1.tar.xz.md5 (revision 3) @@ -0,0 +1,1 @@ +9f94939c0efca2ca3eafd8cd3255a0f0 gdal-3.7.1.tar.xz Index: gdalautotest-3.7.1.tar.gz =================================================================== Binary file gdalautotest-3.7.1.tar.gz (revision 3) added Index: gdal-3.6.3.tar.xz =================================================================== Binary file gdal-3.6.3.tar.xz (revision 168) deleted Index: gdal-3.6.3.tar.xz.md5 =================================================================== --- gdal-3.6.3.tar.xz.md5 (revision 168) +++ gdal-3.6.3.tar.xz.md5 (deleted) @@ -1,1 +0,0 @@ -a6ccbcd5c90bf18dc1bf9b726583c505 gdal-3.6.3.tar.xz Index: gdalautotest-3.6.3.tar.gz =================================================================== Binary file gdalautotest-3.6.3.tar.gz (revision 168) deleted OBS-URL: https://build.opensuse.org/request/show/1108396 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=169 --- gdal-3.6.3.tar.xz | 3 --- gdal-3.6.3.tar.xz.md5 | 1 - gdal-3.7.1.tar.xz | 3 +++ gdal-3.7.1.tar.xz.md5 | 1 + gdal.changes | 43 ++++++++++++++++++++++++++++++--------- gdal.spec | 12 ++++++++--- gdalautotest-3.6.3.tar.gz | 3 --- gdalautotest-3.7.1.tar.gz | 3 +++ 8 files changed, 49 insertions(+), 20 deletions(-) delete mode 100644 gdal-3.6.3.tar.xz delete mode 100644 gdal-3.6.3.tar.xz.md5 create mode 100644 gdal-3.7.1.tar.xz create mode 100644 gdal-3.7.1.tar.xz.md5 delete mode 100644 gdalautotest-3.6.3.tar.gz create mode 100644 gdalautotest-3.7.1.tar.gz diff --git a/gdal-3.6.3.tar.xz b/gdal-3.6.3.tar.xz deleted file mode 100644 index ca00ea9..0000000 --- a/gdal-3.6.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cccbed883b1fb99b913966aa3a650ad930e7c3afc714f5823f9754176ee49ea -size 8645148 diff --git a/gdal-3.6.3.tar.xz.md5 b/gdal-3.6.3.tar.xz.md5 deleted file mode 100644 index b65bfb0..0000000 --- a/gdal-3.6.3.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -a6ccbcd5c90bf18dc1bf9b726583c505 gdal-3.6.3.tar.xz diff --git a/gdal-3.7.1.tar.xz b/gdal-3.7.1.tar.xz new file mode 100644 index 0000000..8210703 --- /dev/null +++ b/gdal-3.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9297948f0a8ba9e6369cd50e87c7e2442eda95336b94d2b92ef1829d260b9a06 +size 8614512 diff --git a/gdal-3.7.1.tar.xz.md5 b/gdal-3.7.1.tar.xz.md5 new file mode 100644 index 0000000..b034599 --- /dev/null +++ b/gdal-3.7.1.tar.xz.md5 @@ -0,0 +1 @@ +9f94939c0efca2ca3eafd8cd3255a0f0 gdal-3.7.1.tar.xz diff --git a/gdal.changes b/gdal.changes index 9991198..3a13f45 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,7 +1,30 @@ +------------------------------------------------------------------- +Mon Aug 21 19:11:24 UTC 2023 - Bruno Friedmann + +- update to bugfix release version 3.7.1 + * see https://github.com/OSGeo/gdal/blob/v3.7.1/NEWS.md +- update to feature release version 3.7.0 + + see https://github.com/OSGeo/gdal/blob/v3.7.0/NEWS.md +- packaging: + * add new buildrequire pkgconfig(libarchive) + for new /vsi7z/ and /vsirar/ virtual file systems + * handle new delivered files + data/gfs.xsd: XML schema for .gfs files (#6655) + data/gml_registry.xsd: new file with XML schema of + gml_registry.xml (#6716) + data/ogrinfo_output.json.schema: validate ogrinfo -json output + data/gdalinfo_output.schema.json: validate gdalinfo -json + output (fixes #6850) + data/grib2_table_4_2_0_21.csv + data/grib2_table_4_2_2_6.csv + bin/sozip + * spec-cleaner + * remove limitation for python < 3.11 as Factory has 3.11.4 + ------------------------------------------------------------------- Fri May 26 12:18:37 UTC 2023 - Boris Manojlovic -- add required development rpms +- add required development rpms ------------------------------------------------------------------- Fri Mar 17 16:37:12 UTC 2023 - Dirk Müller @@ -20,20 +43,20 @@ Sun Jan 8 20:46:55 UTC 2023 - Matthias Eliasson Thu Dec 15 16:17:22 UTC 2022 - Bruno Friedmann - Update to bugfix 3.6.1 (critical) - Important: GDAL 3.6.1 officially retracts GDAL 3.6.0 + Important: GDAL 3.6.1 officially retracts GDAL 3.6.0 which cause corruption of the spatial index of GeoPackage files - it created (in tables with 100 000 features or more): cf - https://github.com/qgis/QGIS/issues/51188 and - https://github.com/OSGeo/gdal/pull/6911. - GDAL 3.6.1 fixes that issue. + it created (in tables with 100 000 features or more): cf + https://github.com/qgis/QGIS/issues/51188 and + https://github.com/OSGeo/gdal/pull/6911. + GDAL 3.6.1 fixes that issue. Setting OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable (at generation time) also works around the issue with GDAL 3.6.0. - Users who have generated corrupted GeoPackage files with 3.6.0 - can regnerate them with 3.6.1 with: - "ogr2ogr out_ok.gpkg in_corrupted.gpkg" + Users who have generated corrupted GeoPackage files with 3.6.0 + can regnerate them with 3.6.1 with: + "ogr2ogr out_ok.gpkg in_corrupted.gpkg" (assuming a GeoPackage file with vector content only) Consult the release notes for the list of issues addressed : - https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md + https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md ------------------------------------------------------------------- Sat Nov 26 19:19:19 UTC 2022 - Bruno Friedmann diff --git a/gdal.spec b/gdal.spec index 00f9f65..7c8da47 100644 --- a/gdal.spec +++ b/gdal.spec @@ -16,7 +16,7 @@ # -%define soversion 32 +%define soversion 33 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL @@ -31,7 +31,7 @@ %bcond_with deflate_support %bcond_with tests_support Name: gdal -Version: 3.6.3 +Version: 3.7.1 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: BSD-3-Clause AND MIT AND SUSE-Public-Domain @@ -64,6 +64,8 @@ BuildRequires: libzstd-devel BuildRequires: mysql-devel BuildRequires: pcre2-devel BuildRequires: pkgconfig +BuildRequires: python3-base +BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools %if 0%{?sle_version} == 150300 && 0%{?is_opensuse} @@ -89,6 +91,7 @@ BuildRequires: pkgconfig(expat) >= 1.95.0 BuildRequires: pkgconfig(freexl) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json-c) +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libgeotiff) >= 1.2.1 BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblz4) @@ -195,7 +198,8 @@ bash command line completion support for GDAL # Prepare tests tar -xf %{S:2} # Delete bundled libraries -rm -rv frmts/zlib +# keep zlib due to missing frmts/zlib/contrib/infback9 in our package +# rm -rv frmts/zlib rm -rv frmts/png/libpng rm -rv frmts/gif/giflib rm -rv frmts/jpeg/libjpeg @@ -363,6 +367,7 @@ popd %{_bindir}/ogrinfo %{_bindir}/ogrlineref %{_bindir}/ogrtindex +%{_bindir}/sozip %{_datadir}/gdal %{_mandir}/man1/gdal_contour.1%{?ext_man} %{_mandir}/man1/gdal_create.1%{?ext_man} @@ -388,6 +393,7 @@ popd %{_mandir}/man1/ogrinfo.1%{?ext_man} %{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man} +%{_mandir}/man1/sozip.1%{?ext_man} # 20201104 We keep all binaries in gdal and requires python3-GDAL %{_bindir}/gdalattachpct.py %{_bindir}/gdal2tiles.py diff --git a/gdalautotest-3.6.3.tar.gz b/gdalautotest-3.6.3.tar.gz deleted file mode 100644 index f6dfe63..0000000 --- a/gdalautotest-3.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44299ceae9066d8518441dad729eaf05f6dd996c4dbe4719015a63495860270d -size 12613287 diff --git a/gdalautotest-3.7.1.tar.gz b/gdalautotest-3.7.1.tar.gz new file mode 100644 index 0000000..68961f4 --- /dev/null +++ b/gdalautotest-3.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3bf50ec205180b3333dc93f796ea6b0f5a5c07a55ea1382bf192e73c03a9da2 +size 13830135