BR: libarchive

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

.gitignore

@@ -92,3 +92,23 @@ gdalautotest-1.7.0.tar.gz
 /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-3.8.0-fedora.tar.xz
+/gdalautotest-3.8.0.tar.gz
+/gdal-3.8.1-fedora.tar.xz
+/gdalautotest-3.8.1.tar.gz
+/gdal-3.8.2-fedora.tar.xz
+/gdalautotest-3.8.2.tar.gz
+/gdal-3.8.3-fedora.tar.xz
+/gdalautotest-3.8.3.tar.gz
+/gdal-3.8.4-fedora.tar.xz
+/gdalautotest-3.8.4.tar.gz

gdal-config

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

gdal.spec

@@ -50,8 +50,8 @@
 
 
 Name:          gdal
-Version:       3.6.3
-Release:       1%{?dist}
+Version:       3.8.4
+Release:       2%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -71,6 +71,8 @@ Source5:       %{name}-cleaner.sh
 
 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
+# Fix passing incompatible pointer type
+Patch1:        gdal_incompatible-pointer-types.patch
 
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -84,10 +86,16 @@ 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
+BuildRequires: libarchive-devel
+%ifnarch %{ix86} %{arm}
+BuildRequires: libarrow-devel
+%endif
 BuildRequires: libdap-devel
+BuildRequires: libdeflate-devel
 BuildRequires: libgeotiff-devel
 BuildRequires: libgta-devel
 BuildRequires: libjpeg-devel
@@ -95,7 +103,6 @@ BuildRequires: libkml-devel
 BuildRequires: liblerc-devel
 BuildRequires: libpng-devel
 BuildRequires: libpq-devel
-BuildRequires: librx-devel
 %if %{with_spatialite}
 BuildRequires: libspatialite-devel
 %endif
@@ -133,6 +140,7 @@ BuildRequires: mingw32-expat
 BuildRequires: mingw32-freexl
 BuildRequires: mingw32-geos
 BuildRequires: mingw32-giflib
+BuildRequires: mingw32-libarchive
 BuildRequires: mingw32-libgeotiff
 BuildRequires: mingw32-libgta
 BuildRequires: mingw32-libjpeg-turbo
@@ -163,6 +171,7 @@ BuildRequires: mingw64-expat
 BuildRequires: mingw64-freexl
 BuildRequires: mingw64-geos
 BuildRequires: mingw64-giflib
+BuildRequires: mingw64-libarchive
 BuildRequires: mingw64-libgeotiff
 BuildRequires: mingw64-libgta
 BuildRequires: mingw64-libjpeg-turbo
@@ -381,13 +390,17 @@ cp -a %{SOURCE4} .
 %cmake \
   -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
   -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \
-  -DGDAL_USE_JPEG12_INTERNAL=OFF
+  -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \
+  -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
 
@@ -442,6 +455,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %{_bindir}/gdalbuildvrt
 %{_bindir}/gdaldem
 %{_bindir}/gdalenhance
+%{_bindir}/gdal_footprint
 %{_bindir}/gdalinfo
 %{_bindir}/gdallocationinfo
 %{_bindir}/gdalmanage
@@ -459,6 +473,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %{_bindir}/ogrlineref
 %{_bindir}/ogrtindex
 %{_bindir}/s57dump
+%{_bindir}/sozip
 %{_datadir}/bash-completion/completions/*
 %exclude %{_datadir}/bash-completion/completions/*.py
 %{_mandir}/man1/*
@@ -468,8 +483,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %files libs
 %license LICENSE.TXT
 %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora
-%{_libdir}/libgdal.so.32
-%{_libdir}/libgdal.so.32.*
+%{_libdir}/libgdal.so.34
+%{_libdir}/libgdal.so.34.*
 %{_datadir}/%{name}/
 %{_libdir}/gdalplugins/
 
@@ -485,7 +500,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 %if %{with mingw}
 %files -n mingw32-%{name}
 %license LICENSE.TXT
-%{mingw32_bindir}/libgdal-32.dll
+%{mingw32_bindir}/libgdal-34.dll
 %{mingw32_bindir}/gdal-config
 %{mingw32_libdir}/libgdal.dll.a
 %{mingw32_libdir}/cmake/gdal/
@@ -498,7 +513,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 %files -n mingw64-%{name}
 %license LICENSE.TXT
-%{mingw64_bindir}/libgdal-32.dll
+%{mingw64_bindir}/libgdal-34.dll
 %{mingw64_bindir}/gdal-config
 %{mingw64_libdir}/libgdal.dll.a
 %{mingw64_libdir}/cmake/gdal/
@@ -566,6 +581,84 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Mon Feb 26 2024 Sandro Mani <manisandro@gmail.com> - 3.8.4-2
+- BR: libarchive
+
+* Sun Feb 18 2024 Sandro Mani <manisandro@gmail.com> - 3.8.4-1
+- Update to 3.8.4
+
+* Fri Feb 02 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-5
+- Rebuild (poppler)
+
+* Sat Jan 27 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-4
+- Enable libarrow, libdeflate
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 08 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-1
+- Update to 3.8.3
+
+* Thu Dec 21 2023 Sandro Mani <manisandro@gmail.com> - 3.8.2-2
+- Rebuild (armadillo)
+
+* Wed Dec 20 2023 Sandro Mani <manisandro@gmail.com> - 3.8.2-1
+- Update to 3.8.2
+
+* Wed Dec 20 2023 Sandro Mani <manisandro@gmail.com> - 3.8.1-2
+- Rebuild (armadillo)
+
+* Thu Nov 30 2023 Sandro Mani <manisandro@gmail.com> - 3.8.1-1
+- Update to 3.8.1
+
+* Tue Nov 14 2023 Sandro Mani <manisandro@gmail.com> - 3.8.0-1
+- Update to 3.8.0
+
+* Fri Nov 03 2023 Sandro Mani <manisandro@gmail.com> - 3.7.3-1
+- Update to 3.7.3
+
+* Wed Sep 13 2023 Sandro Mani <manisandro@gmail.com> - 3.7.2-1
+- Update to 3.7.2
+
+* Sun Sep 03 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-7
+- Rebuild (proj)
+
+* Tue Aug 15 2023 Sandro Mani <manisandro@gmail.com> - 3.7.1-6
+- 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
 
@@ -1484,7 +1577,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 - Added jnis
 - Patches updated with proper version info
 - Added suggestions from Ralph Apel <r.apel@r-apel.de>
-	+ Versionless symlink for gdal.jar
-	+ Maven2 pom
-	+ JPP-style depmap
-	+ Use -f XX.files for ruby and python
+  + Versionless symlink for gdal.jar
+  + Maven2 pom
+  + JPP-style depmap
+  + Use -f XX.files for ruby and python

gdal_incompatible-pointer-types.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.8.4-fedora/port/cpl_vsil_win32.cpp gdal-3.8.4-fedora-new/port/cpl_vsil_win32.cpp
+--- gdal-3.8.4-fedora/port/cpl_vsil_win32.cpp	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/port/cpl_vsil_win32.cpp	2024-02-18 23:38:43.682963451 +0100
+@@ -812,7 +812,7 @@ int VSIWin32FilesystemHandler::Stat(cons
+         }
+         else
+         {
+-            nResult = _wstat64(pwszFilename, pStatBuf);
++            nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
+             if (nResult < 0)
+             {
+                 DWORD nLastError = GetLastError();

gdal_utils.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.8.4-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.4-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.8.4-fedora/frmts/iso8211/CMakeLists.txt	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/frmts/iso8211/CMakeLists.txt	2024-02-18 23:38:43.387970571 +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.6.3-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.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-07 18:14:55.000000000 +0100
-+++ gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2023-03-14 09:21:05.455845507 +0100
+diff -rupN --no-dereference gdal-3.8.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.8.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-02-18 23:38:43.391970475 +0100
 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
  gdal_standard_includes(ogr_S57)
  

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.6.3-fedora.tar.xz) = cacfde8de337fd922cdd22a6061fe14e28bfbd1e36ff58c0990d20fb1cb23c6e06ea02d8c92745028b1699821c19b00617b2cddfacfbe2f86759cb9c5e1b7013
-SHA512 (gdalautotest-3.6.3.tar.gz) = 2967c07a0c5cb426048ead60b6428e8ebb5c5f4bd1ff7409991537575b5a1eabd1d4da2d65607894e16153fd4ce8a31a501788b938a155ddf8cec581fddac1d4
+SHA512 (gdal-3.8.4-fedora.tar.xz) = 4acfe6f7bc980edf928b9244c103df1eb38858c052b90b4270b20362998bc4c597c24e2ec1df713f3f4890d82330667f43dc65a9c5f5779a3ee1a910c449bd26
+SHA512 (gdalautotest-3.8.4.tar.gz) = 582a67bfabfa98e552d8c6ad6a1666ab770534c74d982f44714223c7dc98fba2854b266fc84d58191db54e4cc859eaf91426c2b738bee228918f730057ded751