Fix gdal-cleaner.sh not removing intended files (#2384093)

.gitignore

@@ -118,3 +118,5 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-3.9.0.tar.gz
 /gdal-3.9.1-fedora.tar.xz
 /gdalautotest-3.9.1.tar.gz
+/gdalautotest-3.9.3.tar.gz
+/gdal-3.9.3-fedora.tar.xz

gdal-cleaner.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
+set -e
 
 if [ $# -lt 1 ]; then
-	echo "Usage: $0 version"
+	echo "Usage: $0 version pre"
 	exit 1
 fi
 
@@ -18,20 +19,20 @@ if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
 fi
 
 tar xvf gdal-"${VERSION}${PRE}".tar.xz
-mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
+mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
 
-rm data/cubewerx_extra.wkt
-rm data/esri_StatePlane_extra.wkt
-rm data/ecw_cs.wkt
+rm ogr/data/cubewerx_extra.wkt
+rm ogr/data/esri_StatePlane_extra.wkt
+rm ogr/data/ecw_cs.wkt
 
 
-sed -i 's|data/cubewerx_extra.wkt||' gdal.cmake
-sed -i 's|data/esri_StatePlane_extra.wkt||' gdal.cmake
-sed -i 's|data/ecw_cs.wkt||' gdal.cmake
+sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt
+sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt
+sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt
 
 popd
 
 
 #TODO: Insert Provenance file
 
-tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora
+tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora

gdal.spec

@@ -50,7 +50,7 @@
 
 
 Name:          gdal
-Version:       3.9.1
+Version:       3.9.3
 Release:       2%{?dist}
 Summary:       GIS file format library
 License:       MIT
@@ -202,6 +202,7 @@ BuildRequires: mingw64-zstd
 # Python
 %if %{with python3}
 BuildRequires: python3-devel
+BuildRequires: python3-filelock
 BuildRequires: python3-numpy
 BuildRequires: python3-setuptools
 BuildRequires: python3dist(pytest) >= 3.6
@@ -640,6 +641,24 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Tue Jul 29 2025 Sandro Mani <manisandro@gmail.com> - 3.9.3-2
+- Fix gdal-cleaner.sh not removing intended files (#2384093)
+
+* Tue Oct 15 2024 Sandro Mani <manisandro@gmail.com> - 3.9.3-1
+- Update to 3.9.3
+
+* Mon Sep 16 2024 Sandro Mani <manisandro@gmail.com> - 3.9.2-4
+- Rebuild (proj)
+
+* Fri Aug 23 2024 Sandro Mani <manisandro@gmail.com> - 3.9.2-3
+- Rebuild (mingw-poppler)
+
+* Thu Aug 22 2024 Marek Kasik <mkasik@redhat.com> - 3.9.2-2
+- Rebuild for poppler 24.08.0
+
+* Sat Aug 17 2024 Sandro Mani <manisandro@gmail.com> - 3.9.2-1
+- Update to 3.9.2
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

gdal_incompatible-pointer-types.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.9.1-fedora/port/cpl_vsil_win32.cpp gdal-3.9.1-fedora-new/port/cpl_vsil_win32.cpp
---- gdal-3.9.1-fedora/port/cpl_vsil_win32.cpp	2024-06-23 00:04:02.000000000 +0200
-+++ gdal-3.9.1-fedora-new/port/cpl_vsil_win32.cpp	2024-06-26 14:10:19.573087395 +0200
+diff -rupN --no-dereference gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp
+--- gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp	2024-10-07 18:02:07.000000000 +0200
++++ gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp	2024-10-15 08:07:44.994694330 +0200
 @@ -868,7 +868,7 @@ int VSIWin32FilesystemHandler::Stat(cons
              pwszFilename[nLen - 1] = 0;
  #endif

gdal_utils.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.9.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.1-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.9.1-fedora/frmts/iso8211/CMakeLists.txt	2024-06-23 00:04:01.000000000 +0200
-+++ gdal-3.9.1-fedora-new/frmts/iso8211/CMakeLists.txt	2024-06-26 14:10:19.294087763 +0200
+diff -rupN --no-dereference gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt	2024-10-07 18:02:06.000000000 +0200
++++ gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt	2024-10-15 08:07:44.760697595 +0200
 @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P
  gdal_standard_includes(gdal_iso8211)
  
@@ -22,9 +22,9 @@ diff -rupN --no-dereference gdal-3.9.1-fedora/frmts/iso8211/CMakeLists.txt gdal-
  target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
  target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff -rupN --no-dereference gdal-3.9.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.9.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-06-23 00:04:01.000000000 +0200
-+++ gdal-3.9.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-06-26 14:10:19.294087763 +0200
+diff -rupN --no-dereference gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-10-07 18:02:06.000000000 +0200
++++ gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-10-15 08:07:44.760697595 +0200
 @@ -27,7 +27,8 @@ set_property(
    APPEND
    PROPERTY RESOURCE "${GDAL_DATA_FILES}")

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.9.1-fedora.tar.xz) = b672d91a1d4b04caa06e7abda9f3ab8688195991377a9254bd40524022a9737b7e29983a72de20ff71d00d635a510ab6cc1f580d7a805820bf90eea4eb699131
-SHA512 (gdalautotest-3.9.1.tar.gz) = e35c3dbd4239b1404b0fb774dae1d675bdfbc406d97ac909ec0e20b57d60fbc9236158871249fbdf9e3fb727b3d16a13a366803462afde9f2be4cb1efd91bf6e
+SHA512 (gdalautotest-3.9.3.tar.gz) = a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61
+SHA512 (gdal-3.9.3-fedora.tar.xz) = 55d2351e103372e3effd74dd21e763a9c281b1005d9c452f058da9f78469470e910fceff2d4f92b028c0185f55ecbcd62f044cbe9faf0f3702d7361f84324772