SHA256
1
0
forked from pool/gdal

Accepting request 1108396 from home:bruno_friedmann:branches:Application:Geo

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 <bruno@ioda-net.ch>
+
+- 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 <boris@steki.net>
 
-- add required development rpms  
+- add required development rpms
 
 -------------------------------------------------------------------
 Fri Mar 17 16:37:12 UTC 2023 - Dirk Müller <dmueller@suse.com>
@@ -20,20 +43,20 @@
 Thu Dec 15 16:17:22 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch>
 
 - 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 <bruno@ioda-net.ch>
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
This commit is contained in:
Bruno Friedmann 2023-09-11 18:17:23 +00:00 committed by Git OBS Bridge
parent 16f1d5f429
commit eaf16da376
8 changed files with 49 additions and 20 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cccbed883b1fb99b913966aa3a650ad930e7c3afc714f5823f9754176ee49ea
size 8645148

View File

@ -1 +0,0 @@
a6ccbcd5c90bf18dc1bf9b726583c505 gdal-3.6.3.tar.xz

3
gdal-3.7.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9297948f0a8ba9e6369cd50e87c7e2442eda95336b94d2b92ef1829d260b9a06
size 8614512

1
gdal-3.7.1.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
9f94939c0efca2ca3eafd8cd3255a0f0 gdal-3.7.1.tar.xz

View File

@ -1,7 +1,30 @@
-------------------------------------------------------------------
Mon Aug 21 19:11:24 UTC 2023 - Bruno Friedmann <bruno@ioda-net.ch>
- 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 <boris@steki.net> Fri May 26 12:18:37 UTC 2023 - Boris Manojlovic <boris@steki.net>
- add required development rpms - add required development rpms
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 17 16:37:12 UTC 2023 - Dirk Müller <dmueller@suse.com> Fri Mar 17 16:37:12 UTC 2023 - Dirk Müller <dmueller@suse.com>
@ -20,20 +43,20 @@ Sun Jan 8 20:46:55 UTC 2023 - Matthias Eliasson <elimat@opensuse.org>
Thu Dec 15 16:17:22 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch> Thu Dec 15 16:17:22 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to bugfix 3.6.1 (critical) - 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 which cause corruption of the spatial index of GeoPackage files
it created (in tables with 100 000 features or more): cf it created (in tables with 100 000 features or more): cf
https://github.com/qgis/QGIS/issues/51188 and https://github.com/qgis/QGIS/issues/51188 and
https://github.com/OSGeo/gdal/pull/6911. https://github.com/OSGeo/gdal/pull/6911.
GDAL 3.6.1 fixes that issue. GDAL 3.6.1 fixes that issue.
Setting OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable Setting OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable
(at generation time) also works around the issue with GDAL 3.6.0. (at generation time) also works around the issue with GDAL 3.6.0.
Users who have generated corrupted GeoPackage files with 3.6.0 Users who have generated corrupted GeoPackage files with 3.6.0
can regnerate them with 3.6.1 with: can regnerate them with 3.6.1 with:
"ogr2ogr out_ok.gpkg in_corrupted.gpkg" "ogr2ogr out_ok.gpkg in_corrupted.gpkg"
(assuming a GeoPackage file with vector content only) (assuming a GeoPackage file with vector content only)
Consult the release notes for the list of issues addressed : 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 <bruno@ioda-net.ch> Sat Nov 26 19:19:19 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch>

View File

@ -16,7 +16,7 @@
# #
%define soversion 32 %define soversion 33
%define sourcename gdal %define sourcename gdal
# Uppercase GDAL is the canonical name for this package in Python # Uppercase GDAL is the canonical name for this package in Python
%define pypi_package_name GDAL %define pypi_package_name GDAL
@ -31,7 +31,7 @@
%bcond_with deflate_support %bcond_with deflate_support
%bcond_with tests_support %bcond_with tests_support
Name: gdal Name: gdal
Version: 3.6.3 Version: 3.7.1
Release: 0 Release: 0
Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats
License: BSD-3-Clause AND MIT AND SUSE-Public-Domain License: BSD-3-Clause AND MIT AND SUSE-Public-Domain
@ -64,6 +64,8 @@ BuildRequires: libzstd-devel
BuildRequires: mysql-devel BuildRequires: mysql-devel
BuildRequires: pcre2-devel BuildRequires: pcre2-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: python3-devel
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} %if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
@ -89,6 +91,7 @@ BuildRequires: pkgconfig(expat) >= 1.95.0
BuildRequires: pkgconfig(freexl) BuildRequires: pkgconfig(freexl)
BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json)
BuildRequires: pkgconfig(json-c) BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(libarchive)
BuildRequires: pkgconfig(libgeotiff) >= 1.2.1 BuildRequires: pkgconfig(libgeotiff) >= 1.2.1
BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblz4)
@ -195,7 +198,8 @@ bash command line completion support for GDAL
# Prepare tests # Prepare tests
tar -xf %{S:2} tar -xf %{S:2}
# Delete bundled libraries # 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/png/libpng
rm -rv frmts/gif/giflib rm -rv frmts/gif/giflib
rm -rv frmts/jpeg/libjpeg rm -rv frmts/jpeg/libjpeg
@ -363,6 +367,7 @@ popd
%{_bindir}/ogrinfo %{_bindir}/ogrinfo
%{_bindir}/ogrlineref %{_bindir}/ogrlineref
%{_bindir}/ogrtindex %{_bindir}/ogrtindex
%{_bindir}/sozip
%{_datadir}/gdal %{_datadir}/gdal
%{_mandir}/man1/gdal_contour.1%{?ext_man} %{_mandir}/man1/gdal_contour.1%{?ext_man}
%{_mandir}/man1/gdal_create.1%{?ext_man} %{_mandir}/man1/gdal_create.1%{?ext_man}
@ -388,6 +393,7 @@ popd
%{_mandir}/man1/ogrinfo.1%{?ext_man} %{_mandir}/man1/ogrinfo.1%{?ext_man}
%{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrlineref.1%{?ext_man}
%{_mandir}/man1/ogrtindex.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 # 20201104 We keep all binaries in gdal and requires python3-GDAL
%{_bindir}/gdalattachpct.py %{_bindir}/gdalattachpct.py
%{_bindir}/gdal2tiles.py %{_bindir}/gdal2tiles.py

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:44299ceae9066d8518441dad729eaf05f6dd996c4dbe4719015a63495860270d
size 12613287

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b3bf50ec205180b3333dc93f796ea6b0f5a5c07a55ea1382bf192e73c03a9da2
size 13830135