Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -81,3 +81,24 @@ gdalautotest-1.7.0.tar.gz
 /gdal-3.5.1-fedora.tar.xz
 /gdal-3.5.2-fedora.tar.xz
 /gdalautotest-3.5.2.tar.gz
+/gdal-3.5.3-fedora.tar.xz
+/gdalautotest-3.5.3.tar.gz
+/gdal-3.6.0-fedora.tar.xz
+/gdalautotest-3.6.0.tar.gz
+/gdalautotest-3.6.1.tar.gz
+/gdal-3.6.1.tar.xz
+/gdal-3.6.1-fedora.tar.xz
+/gdal-3.6.2-fedora.tar.xz
+/gdalautotest-3.6.2.tar.gz
+/gdal-3.6.3-fedora.tar.xz
+/gdalautotest-3.6.3.tar.gz
+/gdal-3.6.4-fedora.tar.xz
+/gdalautotest-3.6.4.tar.gz
+/gdal-3.7.0-fedora.tar.xz
+/gdalautotest-3.7.0.tar.gz
+/gdal-3.7.1-fedora.tar.xz
+/gdalautotest-3.7.1.tar.gz
+/gdal-3.7.2-fedora.tar.xz
+/gdalautotest-3.7.2.tar.gz
+/gdal-3.7.3-fedora.tar.xz
+/gdalautotest-3.7.3.tar.gz

gdal-config

@@ -2,7 +2,7 @@
 
 ARCH=$(uname -m)
 case $ARCH in
-x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
+x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
 gdal-config-64 ${*}
 ;;
 *)

gdal.spec

@@ -9,7 +9,6 @@
   %global cpuarch 64
 %endif
 
-%global bootstrap 1
 
 %if 0%{?bootstrap}
 %global with_mysql 0
@@ -31,7 +30,7 @@
 
 %bcond_without python3
 # No complete java yet in EL8
-%if 0%{?rhel} >= 8
+%if 0%{?rhel} == 8
 %bcond_with java
 %else
 %ifarch %{java_arches}
@@ -41,12 +40,18 @@
 %endif
 %endif
 
+%if 0%{?fedora}
+%bcond_without mingw
+%else
+%bcond_with mingw
+%endif
+
 #global pre rc1
 
 
 Name:          gdal
-Version:       3.5.2
+Version:       3.7.3
-Release:       1.3.riscv64%{?dist}
+Release:       1%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -67,11 +72,11 @@ Source5:       %{name}-cleaner.sh
 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
 
-
 BuildRequires: cmake
 BuildRequires: gcc-c++
 
 BuildRequires: armadillo-devel
+BuildRequires: bison
 BuildRequires: cfitsio-devel
 BuildRequires: CharLS-devel
 BuildRequires: curl-devel
@@ -79,6 +84,7 @@ BuildRequires: expat-devel
 BuildRequires: freexl-devel
 BuildRequires: geos-devel
 BuildRequires: giflib-devel
+BuildRequires: gtest-devel
 BuildRequires: hdf-devel
 BuildRequires: hdf5-devel
 BuildRequires: json-c-devel
@@ -90,13 +96,13 @@ BuildRequires: libkml-devel
 BuildRequires: liblerc-devel
 BuildRequires: libpng-devel
 BuildRequires: libpq-devel
-BuildRequires: librx-devel
 %if %{with_spatialite}
 BuildRequires: libspatialite-devel
 %endif
 BuildRequires: libtiff-devel
 BuildRequires: libtirpc-devel
 BuildRequires: libwebp-devel
+BuildRequires: libzstd-devel
 %if 0%{?with_mysql}
 BuildRequires: mariadb-connector-c-devel
 %endif
@@ -117,10 +123,12 @@ BuildRequires: xerces-c-devel
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
 
+%if %{with mingw}
 BuildRequires: mingw32-filesystem >= 102
 BuildRequires: mingw32-gcc-c++
 BuildRequires: mingw32-cfitsio
 BuildRequires: mingw32-curl
+BuildRequires: mingw32-dlfcn
 BuildRequires: mingw32-expat
 BuildRequires: mingw32-freexl
 BuildRequires: mingw32-geos
@@ -136,7 +144,7 @@ BuildRequires: mingw32-libtiff
 BuildRequires: mingw32-libwebp
 BuildRequires: mingw32-openexr
 BuildRequires: mingw32-openjpeg2
-BuildRequires: mingw32-pcre
+BuildRequires: mingw32-pcre2
 BuildRequires: mingw32-poppler
 BuildRequires: mingw32-postgresql
 BuildRequires: mingw32-proj
@@ -144,11 +152,13 @@ BuildRequires: mingw32-sqlite
 BuildRequires: mingw32-xerces-c
 BuildRequires: mingw32-xz-libs
 BuildRequires: mingw32-zlib
+BuildRequires: mingw32-zstd
 
 BuildRequires: mingw64-filesystem >= 102
 BuildRequires: mingw64-gcc-c++
 BuildRequires: mingw64-cfitsio
 BuildRequires: mingw64-curl
+BuildRequires: mingw64-dlfcn
 BuildRequires: mingw64-expat
 BuildRequires: mingw64-freexl
 BuildRequires: mingw64-geos
@@ -164,7 +174,7 @@ BuildRequires: mingw64-libtiff
 BuildRequires: mingw64-libwebp
 BuildRequires: mingw64-openexr
 BuildRequires: mingw64-openjpeg2
-BuildRequires: mingw64-pcre
+BuildRequires: mingw64-pcre2
 BuildRequires: mingw64-poppler
 BuildRequires: mingw64-postgresql
 BuildRequires: mingw64-proj
@@ -172,6 +182,8 @@ BuildRequires: mingw64-sqlite
 BuildRequires: mingw64-xerces-c
 BuildRequires: mingw64-xz-libs
 BuildRequires: mingw64-zlib
+BuildRequires: mingw64-zstd
+%endif
 
 # Python
 %if %{with python3}
@@ -181,6 +193,7 @@ BuildRequires: python3-setuptools
 BuildRequires: python3dist(pytest) >= 3.6
 BuildRequires: python3dist(lxml) >= 4.5.1
 
+%if %{with mingw}
 BuildRequires: mingw32-python3
 BuildRequires: mingw32-python3-numpy
 BuildRequires: mingw32-python3-setuptools
@@ -189,6 +202,7 @@ BuildRequires: mingw64-python3
 BuildRequires: mingw64-python3-numpy
 BuildRequires: mingw64-python3-setuptools
 %endif
+%endif
 
 # Java
 %if %{with java}
@@ -232,7 +246,7 @@ Provides:      bundled(degrib) = 2.14
 %description libs
 This package contains the GDAL file format library.
 
-
+%if %{with mingw}
 %package -n mingw32-%{name}
 Summary:       MinGW Windows GDAL library
 # GDAL bundles a modified copy of g2clib and degrib
@@ -271,7 +285,7 @@ BuildArch:     noarch
 
 %description -n mingw64-%{name}-tools
 MinGW Windows GDAL library tools.
-
+%endif
 
 # No complete java yet in EL8
 %if %{with java}
@@ -314,6 +328,7 @@ The GDAL Python package provides number of tools for programming and
 manipulating GDAL file format library
 
 
+%if %{with mingw}
 %package -n mingw32-python3-%{name}
 Summary:       MinGW Windows Python3 GDAL bindings
 
@@ -326,18 +341,19 @@ Summary:       MinGW Windows Python3 GDAL bindings
 
 %description -n mingw64-python3-%{name}
 MinGW Windows Python3 GDAL bindings.
-
+%endif
 
 # We don't want to provide private Python extension libs
 %global __provides_exclude_from ^%{python3_sitearch}/.*\.so$
 %endif
 
 
+%if %{with mingw}
 %{?mingw_debug_package}
-
+%endif
 
 %prep
-%autosetup -p1 -n %{name}-%{version}-fedora
+%autosetup -N -p1 -n %{name}-%{version}-fedora
 
 # Delete bundled libraries
 rm -rf frmts/zlib
@@ -354,6 +370,9 @@ rm -rf third_party/LercLib
 tar xf %{SOURCE1}
 mv %{name}autotest-%{version} autotest
 
+# Need to patch autotest
+%autopatch -p1
+
 # Copy in PROVENANCE.TXT-fedora
 cp -a %{SOURCE4} .
 
@@ -362,18 +381,29 @@ cp -a %{SOURCE4} .
 %cmake \
   -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
   -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \
-  -DGDAL_USE_JPEG12_INTERNAL=OFF
+  -DGDAL_USE_JPEG12_INTERNAL=OFF \
+  -DENABLE_DEFLATE64=OFF
 %cmake_build
 
+%if %{with mingw}
 %mingw_cmake \
+  -DBUILD_TESTING=OFF \
   -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
-  -DGDAL_USE_JPEG12_INTERNAL=OFF
+  -DGDAL_USE_JPEG12_INTERNAL=OFF \
+  -DENABLE_DEFLATE64=OFF
 %mingw_make_build
+%endif
 
 
 %install
 %cmake_install
+
+%if %{with mingw}
 %mingw_make_install
+# Delete data from cross packages
+rm -r %{buildroot}%{mingw32_datadir}
+rm -r %{buildroot}%{mingw64_datadir}
+%endif
 
 # List of manpages for python scripts
 for file in %{buildroot}%{_bindir}/*.py; do
@@ -391,12 +421,10 @@ cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{name}/cpl_config.h
 mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch}
 cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
-# Delete data from cross packages
-rm -r %{buildroot}%{mingw32_datadir}
-rm -r %{buildroot}%{mingw64_datadir}
-
 
+%if %{with mingw}
 %mingw_debug_install_post
+%endif
 
 
 %if 0%{run_tests}
@@ -434,6 +462,7 @@ rm -r %{buildroot}%{mingw64_datadir}
 %{_bindir}/ogrlineref
 %{_bindir}/ogrtindex
 %{_bindir}/s57dump
+%{_bindir}/sozip
 %{_datadir}/bash-completion/completions/*
 %exclude %{_datadir}/bash-completion/completions/*.py
 %{_mandir}/man1/*
@@ -443,8 +472,8 @@ rm -r %{buildroot}%{mingw64_datadir}
 %files libs
 %license LICENSE.TXT
 %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
-%{_libdir}/libgdal.so.31
+%{_libdir}/libgdal.so.33
-%{_libdir}/libgdal.so.31.*
+%{_libdir}/libgdal.so.33.*
 %{_datadir}/%{name}/
 %{_libdir}/gdalplugins/
 
@@ -457,9 +486,10 @@ rm -r %{buildroot}%{mingw64_datadir}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man1/gdal-config.1*
 
+%if %{with mingw}
 %files -n mingw32-%{name}
 %license LICENSE.TXT
-%{mingw32_bindir}/libgdal-31.dll
+%{mingw32_bindir}/libgdal-33.dll
 %{mingw32_bindir}/gdal-config
 %{mingw32_libdir}/libgdal.dll.a
 %{mingw32_libdir}/cmake/gdal/
@@ -472,7 +502,7 @@ rm -r %{buildroot}%{mingw64_datadir}
 
 %files -n mingw64-%{name}
 %license LICENSE.TXT
-%{mingw64_bindir}/libgdal-31.dll
+%{mingw64_bindir}/libgdal-33.dll
 %{mingw64_bindir}/gdal-config
 %{mingw64_libdir}/libgdal.dll.a
 %{mingw64_libdir}/cmake/gdal/
@@ -482,6 +512,7 @@ rm -r %{buildroot}%{mingw64_datadir}
 
 %files -n mingw64-%{name}-tools
 %{mingw64_bindir}/*.exe
+%endif
 
 %if %{with python3}
 %files -n python3-gdal
@@ -505,11 +536,13 @@ rm -r %{buildroot}%{mingw64_datadir}
 %{_bindir}/gdalattachpct.py
 %{_bindir}/gdalcompare.py
 %{_bindir}/gdalmove.py
+%{_bindir}/ogr_layer_algebra.py
 %{_bindir}/ogrmerge.py
 %{_bindir}/pct2rgb.py
 %{_bindir}/rgb2pct.py
 %{_datadir}/bash-completion/completions/*.py
 
+%if %{with mingw}
 %files -n mingw32-python3-%{name}
 %{mingw32_bindir}/*.py
 %{mingw32_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/
@@ -522,6 +555,7 @@ rm -r %{buildroot}%{mingw64_datadir}
 %{mingw64_python3_sitearch}/osgeo/
 %{mingw64_python3_sitearch}/osgeo_utils/
 %endif
+%endif
 
 %if %{with java}
 %files java
@@ -536,17 +570,105 @@ rm -r %{buildroot}%{mingw64_datadir}
 
 
 %changelog
-* Wed Oct 26 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.5.2-1.3.riscv64
+* Fri Nov 03 2023 Sandro Mani <manisandro@gmail.com> - 3.7.3-1
-- Rebuild for new libgta
+- Update to 3.7.3
 
-* Wed Oct 26 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.5.2-1.2.riscv64
+* Wed Sep 13 2023 Sandro Mani <manisandro@gmail.com> - 3.7.2-1
-- Rebuild to fix gdal-config
+- Update to 3.7.2
 
-* Tue Oct 18 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.5.2-1.1.riscv64
+* Sun Sep 03 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-7
-- Bump (libpq)
+- Rebuild (proj)
 
-* Tue Oct 04 2022 David Abdurachmanov <davidlt@rivosinc.com> - 3.5.2-1.0.riscv64
+* Tue Aug 15 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-6
-- Bootstrap on riscv64
+- Rebuild (libspatialite)
+
+* Mon Aug 14 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-5
+- Rebuild (mingw-poppler)
+
+* Wed Aug  9 2023 Tom Callaway <spot@fedoraproject.org> - 3.7.1-4
+- rebuild for new qhull
+
+* Mon Aug 07 2023 Marek Kasik <mkasik@redhat.com> - 3.7.1-3
+- Rebuild for poppler 23.08.0
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 18 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-1
+- Update to 3.7.1
+
+* Mon Jul 03 2023 Python Maint <python-maint@redhat.com> - 3.7.0-2
+- Rebuilt for Python 3.12
+
+* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 3.7.0-1
+- Update to 3.7.0
+
+* Tue May 09 2023 Markus Neteler <neteler@mundialis.de> - 3.6.4-3
+- SPDX migration
+
+* Tue May 02 2023 Sandro Mani <manisandro@gmail.com> - 3.6.4-2
+- Drop unused librx BR
+
+* Sat Apr 22 2023 Sandro Mani <manisandro@gmail.com> - 3.6.4-1
+- Update to 3.6.4
+
+* Tue Mar 14 2023 Sandro Mani <manisandro@gmail.com> - 3.6.3-1
+- Update to 3.6.3
+
+* Sat Mar 04 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-6
+- Rebuild (proj)
+
+* Tue Feb 07 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-5
+- Rebuild (mingw-poppler)
+
+* Sat Feb 04 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-4
+- Rebuild (poppler)
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 12 2023 Maxwell G <gotmax@e.email> - 3.6.2-2
+- Rebuild for cfitsio 4.2
+
+* Thu Jan 05 2023 Sandro Mani <manisandro@gmail.com> - 3.6.2-1
+- Update to 3.6.2
+
+* Mon Jan 02 2023 Sandro Mani <manisandro@gmail.com> - 3.6.1-3
+- Rebuild (mingw-cfitsio)
+
+* Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 3.6.1-2
+- Rebuild for cfitsio 4.2
+
+* Thu Dec 15 2022 Sandro Mani <manisandro@gmail.com> - 3.6.1-1
+- Update to 3.6.1
+
+* Mon Dec 05 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-4
+- Rebuild (mingw-xerces-c)
+
+* Mon Dec 05 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-3
+- Switch to pcre2 for mingw build
+
+* Fri Nov 18 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-2
+- Rebuild (mingw-postgresql)
+
+* Fri Nov 11 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-1
+- Update to 3.6.0
+
+* Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.6.0-0.1.rc1
+- Update to 3.6.0-rc1
+
+* Thu Nov 03 2022 Sandro Mani <manisandro@gmail.com> - 3.5.3-2
+- Re-enable java
+
+* Tue Nov 01 2022 Sandro Mani <manisandro@gmail.com> - 3.5.3-1
+- Update to 3.5.3
+
+* Wed Oct 19 2022 Sandro Mani <manisandro@gmail.com> - 3.5.2-3
+- Rebuild (python-3.11)
+
+* Fri Oct 7 2022 Tom Rix <trix@redhat.com> - 3.5.2-2
+- Add mingw build conditional
+- Reduce java build condition to rhel 8
 
 * Tue Sep 13 2022 Sandro Mani <manisandro@gmail.com> - 3.5.2-1
 - Update to 3.5.2
@@ -1408,7 +1530,7 @@ rm -r %{buildroot}%{mingw64_datadir}
 - Added jnis
 - Patches updated with proper version info
 - Added suggestions from Ralph Apel <r.apel@r-apel.de>
-	+ Versionless symlink for gdal.jar
+  + Versionless symlink for gdal.jar
-	+ Maven2 pom
+  + Maven2 pom
-	+ JPP-style depmap
+  + JPP-style depmap
-	+ Use -f XX.files for ruby and python
+  + Use -f XX.files for ruby and python

gdal_utils.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt
+diff -rupN --no-dereference gdal-3.7.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.7.3-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt	2022-06-30 11:26:28.000000000 +0200
+--- gdal-3.7.3-fedora/frmts/iso8211/CMakeLists.txt	2023-10-30 17:03:44.000000000 +0100
-+++ gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt	2022-07-06 13:21:14.754014199 +0200
++++ gdal-3.7.3-fedora-new/frmts/iso8211/CMakeLists.txt	2023-11-03 18:58:27.663679053 +0100
 @@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
  
  # Because linking an OBJECT library
@@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt gdal-
      target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +    install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  endif ()
-diff -rupN --no-dereference gdal-3.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+diff -rupN --no-dereference gdal-3.7.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.7.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2022-06-30 11:26:28.000000000 +0200
+--- gdal-3.7.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-10-30 17:03:44.000000000 +0100
-+++ gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2022-07-06 13:21:14.754014199 +0200
++++ gdal-3.7.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-11-03 18:58:27.663679053 +0100
 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
  gdal_standard_includes(ogr_S57)
  

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.5.2-fedora.tar.xz) = ed6f2a5d370bfaed7266937e018abbafc60468c486699681a84be623b1b5ef20781973589f8840553d532b5e4a8a3d1691b7c6ab48a4e5ee714820abbaac391f
+SHA512 (gdal-3.7.3-fedora.tar.xz) = f521a404396bad3a24280cad813030adfd4718560d2aa9756b96eded042fe20b7a87547d4f905c615180e1f7bcca075422bfb9319bc322d0f3bb2c67bbee5e57
-SHA512 (gdalautotest-3.5.2.tar.gz) = 92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2
+SHA512 (gdalautotest-3.7.3.tar.gz) = e19d5afa9e7280a6ac837b01c23cddc7ff3ca6578ab347b915ec84bdde091f1b54095a2eed0042538eb4eae38613816d79531aa541f6cc6f1cbeee41b2fa11fd