Fix sources

Fix gdal-cleaner.sh not removing intended files (#2384093 )
2025-07-29 07:52:51 +02:00 · 2025-07-29 07:44:35 +02:00
3 changed files with 15 additions and 11 deletions
--- a/gdal-cleaner.sh
+++ b/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
--- a/gdal.spec
+++ b/gdal.spec
@ -47,7 +47,7 @@

 Name:          gdal
 Version:       3.10.3
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@ -776,6 +776,9 @@ find %{buildroot} -name '*.py' -exec sed -i 's|^#!python$|#!/usr/bin/python3|g'


 %changelog
+* Tue Jul 29 2025 Sandro Mani <manisandro@gmail.com> - 3.10.3-3
+- Fix gdal-cleaner.sh not removing intended files (#2384093)
+
 * Fri May 16 2025 Sandro Mani <manisandro@gmail.com> - 3.10.3-2
 - Fix *.py scripts packaging

--- a/2
+++ b/2
@ -1,2 +1,2 @@
-SHA512 (gdal-3.10.3-fedora.tar.xz) = 1dced4c7a62ce74323e26d859b4fe82b67f660ab65c2a44f8de35771b7d9dca73b2d1d8c0497588b686bd3b5ea05045caa9558e19618e4c2b2bea3bf03781483
+SHA512 (gdal-3.10.3-fedora.tar.xz) = c25db41f98ea16cac4e5d742fa78a3b68ae0f0ad21f5ab1825d8daf9d6476050d3a1d23221205434619269d5ebf4a81bf3b7bb47b07e1b979f019a683a1e0e9c
 SHA512 (gdalautotest-3.10.3.tar.gz) = af8637944498adfbc33b26f747bab0ad6b46216c58a994248ad8e252c90c6050709bef1b0c15986edfb6a87ee7d09bac8fd837266b5deb8980409bb018037c60
Author	SHA1	Message	Date
Sandro Mani	6e57820f25	Fix sources	2025-07-29 07:52:51 +02:00
Sandro Mani	c55397ce0c	Fix gdal-cleaner.sh not removing intended files (#2384093 )	2025-07-29 07:44:35 +02:00