From e0eee5c4b1633a94388b1d618fd4507e4892a324 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Wed, 14 Aug 2024 22:26:54 +0200 Subject: [PATCH 1/6] Rebuild for poppler 24.08.0 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 3060b82..5169bcb 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -640,6 +640,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Wed Aug 14 2024 Marek Kasik - 3.9.1-3 +- Rebuild for poppler 24.08.0 + * Thu Jul 18 2024 Fedora Release Engineering - 3.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c4a66b6456bc39f47099141ea8d348cde47ccacf Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 17 Aug 2024 23:30:52 +0200 Subject: [PATCH 2/6] Update to 3.9.2 --- gdal.spec | 8 ++++---- gdal_incompatible-pointer-types.patch | 6 +++--- gdal_utils.patch | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gdal.spec b/gdal.spec index 5169bcb..87b71f5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.9.1 -Release: 3%{?dist} +Version: 3.9.2 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -640,8 +640,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog -* Wed Aug 14 2024 Marek Kasik - 3.9.1-3 -- Rebuild for poppler 24.08.0 +* Sat Aug 17 2024 Sandro Mani - 3.9.2-1 +- Update to 3.9.2 * Thu Jul 18 2024 Fedora Release Engineering - 3.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index 66158c1..8ccc113 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/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.2-fedora/port/cpl_vsil_win32.cpp gdal-3.9.2-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.9.2-fedora/port/cpl_vsil_win32.cpp 2024-08-13 18:05:09.000000000 +0200 ++++ gdal-3.9.2-fedora-new/port/cpl_vsil_win32.cpp 2024-08-17 21:01:37.857799035 +0200 @@ -868,7 +868,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif diff --git a/gdal_utils.patch b/gdal_utils.patch index 28c97c9..c741a31 100644 --- a/gdal_utils.patch +++ b/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.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.2-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.9.2-fedora/frmts/iso8211/CMakeLists.txt 2024-08-13 18:05:08.000000000 +0200 ++++ gdal-3.9.2-fedora-new/frmts/iso8211/CMakeLists.txt 2024-08-17 21:01:37.591798698 +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_link_libraries(8211createfromxml PRIVATE $ 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.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.9.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-08-13 18:05:09.000000000 +0200 ++++ gdal-3.9.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-08-17 21:01:37.591798698 +0200 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") From 4a27de9df1afe4040f1362a09554fe5d35016492 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 17 Aug 2024 23:35:38 +0200 Subject: [PATCH 3/6] Update sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 96dd308..488c540 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.9.1-fedora.tar.xz) = b672d91a1d4b04caa06e7abda9f3ab8688195991377a9254bd40524022a9737b7e29983a72de20ff71d00d635a510ab6cc1f580d7a805820bf90eea4eb699131 -SHA512 (gdalautotest-3.9.1.tar.gz) = e35c3dbd4239b1404b0fb774dae1d675bdfbc406d97ac909ec0e20b57d60fbc9236158871249fbdf9e3fb727b3d16a13a366803462afde9f2be4cb1efd91bf6e +SHA512 (gdal-3.9.2-fedora.tar.xz) = 8c7c724eee441fd824269baa2e371f3ffcd290dac8a538c8c9f1291754b7951d546c0101634e837c822db210769b0f5d39b7fbfe52b1f4bd2dabf7e7c9022e7f +SHA512 (gdalautotest-3.9.2.tar.gz) = 0d6b8e3d5749dedf6011318ed287aa8c9483f42b4780966672250b93fbf703f44329cad2785de33d0c05b24095a0d2518cd7f69003425a254c8b06c54a6eb8c4 From f846f36ab52133d456e595063a6018c76a197aa1 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 22 Aug 2024 12:51:39 +0200 Subject: [PATCH 4/6] Rebuild for poppler 24.08.0 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 87b71f5..c9f5b96 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -640,6 +640,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Aug 22 2024 Marek Kasik - 3.9.2-2 +- Rebuild for poppler 24.08.0 + * Sat Aug 17 2024 Sandro Mani - 3.9.2-1 - Update to 3.9.2 From ec7ab4f2a9818a8c417a9eb8a52d4218d86721b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 15 Oct 2024 09:34:47 +0200 Subject: [PATCH 5/6] Update to 3.9.3 --- gdal.spec | 14 ++++++++++++-- gdal_incompatible-pointer-types.patch | 6 +++--- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/gdal.spec b/gdal.spec index c9f5b96..1d641da 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.9.2 -Release: 2%{?dist} +Version: 3.9.3 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -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,15 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Tue Oct 15 2024 Sandro Mani - 3.9.3-1 +- Update to 3.9.3 + +* Mon Sep 16 2024 Sandro Mani - 3.9.2-4 +- Rebuild (proj) + +* Fri Aug 23 2024 Sandro Mani - 3.9.2-3 +- Rebuild (mingw-poppler) + * Thu Aug 22 2024 Marek Kasik - 3.9.2-2 - Rebuild for poppler 24.08.0 diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index 8ccc113..21678b8 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.9.2-fedora/port/cpl_vsil_win32.cpp gdal-3.9.2-fedora-new/port/cpl_vsil_win32.cpp ---- gdal-3.9.2-fedora/port/cpl_vsil_win32.cpp 2024-08-13 18:05:09.000000000 +0200 -+++ gdal-3.9.2-fedora-new/port/cpl_vsil_win32.cpp 2024-08-17 21:01:37.857799035 +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 diff --git a/gdal_utils.patch b/gdal_utils.patch index c741a31..a3f3868 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.9.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.2-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.9.2-fedora/frmts/iso8211/CMakeLists.txt 2024-08-13 18:05:08.000000000 +0200 -+++ gdal-3.9.2-fedora-new/frmts/iso8211/CMakeLists.txt 2024-08-17 21:01:37.591798698 +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.2-fedora/frmts/iso8211/CMakeLists.txt gdal- target_include_directories(8211createfromxml PRIVATE $) target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff -rupN --no-dereference gdal-3.9.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.9.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-08-13 18:05:09.000000000 +0200 -+++ gdal-3.9.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-08-17 21:01:37.591798698 +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}") diff --git a/sources b/sources index 488c540..2db7a97 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.9.2-fedora.tar.xz) = 8c7c724eee441fd824269baa2e371f3ffcd290dac8a538c8c9f1291754b7951d546c0101634e837c822db210769b0f5d39b7fbfe52b1f4bd2dabf7e7c9022e7f -SHA512 (gdalautotest-3.9.2.tar.gz) = 0d6b8e3d5749dedf6011318ed287aa8c9483f42b4780966672250b93fbf703f44329cad2785de33d0c05b24095a0d2518cd7f69003425a254c8b06c54a6eb8c4 +SHA512 (gdalautotest-3.9.3.tar.gz) = a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61 +SHA512 (gdal-3.9.3-fedora.tar.xz) = 7e5fd560d01cd513f690cce1e83264a97937e2da48f9ce1ad581f64b3a75a35e30c2db810a612e89edc77d7844a4391a9024d7827a867c8c337d2b20de2e92d7 From 24aa2ab91894684b424d9f593b468e98ad8b7fdc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Jul 2025 08:03:36 +0200 Subject: [PATCH 6/6] Fix gdal-cleaner.sh not removing intended files (#2384093) --- .gitignore | 2 ++ gdal-cleaner.sh | 19 ++++++++++--------- gdal.spec | 5 ++++- sources | 2 +- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 79b6497..ddbc7b9 100644 --- a/.gitignore +++ b/.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 diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index db17622..2859e69 100755 --- 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 diff --git a/gdal.spec b/gdal.spec index 1d641da..803ddd1 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -641,6 +641,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Tue Jul 29 2025 Sandro Mani - 3.9.3-2 +- Fix gdal-cleaner.sh not removing intended files (#2384093) + * Tue Oct 15 2024 Sandro Mani - 3.9.3-1 - Update to 3.9.3 diff --git a/sources b/sources index 2db7a97..80809cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gdalautotest-3.9.3.tar.gz) = a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61 -SHA512 (gdal-3.9.3-fedora.tar.xz) = 7e5fd560d01cd513f690cce1e83264a97937e2da48f9ce1ad581f64b3a75a35e30c2db810a612e89edc77d7844a4391a9024d7827a867c8c337d2b20de2e92d7 +SHA512 (gdal-3.9.3-fedora.tar.xz) = 55d2351e103372e3effd74dd21e763a9c281b1005d9c452f058da9f78469470e910fceff2d4f92b028c0185f55ecbcd62f044cbe9faf0f3702d7361f84324772