From ad3453eb76271c13fdc2c682c038301dda51458f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 27 Nov 2024 14:30:32 +0000 Subject: [PATCH 01/49] Rebuild for libarrow 18 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 6162239..2f8353d 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -645,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Wed Nov 27 2024 Richard W.M. Jones - 3.10.0-4 +- Rebuild for libarrow 18 + * Wed Nov 20 2024 Sandro Mani - 3.10.0-3 - Drop fedora conditional for gpsbabel requires From 637386cf97c601bcae74ab7f819a757e3545ab7e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Jan 2025 08:55:47 +0100 Subject: [PATCH 02/49] Update to 3.10.1 --- .gitignore | 1 + gdal.spec | 7 +++++-- gdal_incompatible-pointer-types.patch | 10 +++++----- gdal_utils.patch | 12 ++++++------ sources | 3 +-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index c9b7748..cbfe67d 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ gdalautotest-1.7.0.tar.gz /gdal-3.9.3-fedora.tar.xz /gdal-3.10.0-fedora.tar.xz /gdalautotest-3.10.0.tar.gz +/gdal-3.10.1-fedora.tar.xz diff --git a/gdal.spec b/gdal.spec index 2f8353d..fe2be01 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.10.0 -Release: 4%{?dist} +Version: 3.10.1 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -645,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Tue Jan 14 2025 Sandro Mani - 3.10.1-1 +- Update to 3.10.1 + * Wed Nov 27 2024 Richard W.M. Jones - 3.10.0-4 - Rebuild for libarrow 18 diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index d05e7f2..4cbb9f2 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,7 +1,7 @@ -diff -rupN --no-dereference gdal-3.10.0-fedora/port/cpl_vsil_win32.cpp gdal-3.10.0-fedora-new/port/cpl_vsil_win32.cpp ---- gdal-3.10.0-fedora/port/cpl_vsil_win32.cpp 2024-11-01 16:47:25.000000000 +0100 -+++ gdal-3.10.0-fedora-new/port/cpl_vsil_win32.cpp 2024-11-06 16:50:12.824350522 +0100 -@@ -897,7 +897,7 @@ int VSIWin32FilesystemHandler::Stat(cons +diff -rupN --no-dereference gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp 2025-01-14 22:27:26.805886705 +0100 +@@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif @@ -10,7 +10,7 @@ diff -rupN --no-dereference gdal-3.10.0-fedora/port/cpl_vsil_win32.cpp gdal-3.10 // If _wstat64() fails and the original name is not an extended one, // then retry with an extended filename -@@ -908,7 +908,7 @@ int VSIWin32FilesystemHandler::Stat(cons +@@ -907,7 +907,7 @@ int VSIWin32FilesystemHandler::Stat(cons nLastError == ERROR_FILENAME_EXCED_RANGE) { VSIWin32TryLongFilename(pwszFilename); diff --git a/gdal_utils.patch b/gdal_utils.patch index 924f2df..a6f07e7 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.10.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.0-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.10.0-fedora/frmts/iso8211/CMakeLists.txt 2024-11-01 16:47:25.000000000 +0100 -+++ gdal-3.10.0-fedora-new/frmts/iso8211/CMakeLists.txt 2024-11-06 16:50:12.603332820 +0100 +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-01-14 22:27:26.561168120 +0100 @@ -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.10.0-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.10.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.10.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-11-01 16:47:26.000000000 +0100 -+++ gdal-3.10.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-11-06 16:50:12.604332900 +0100 +diff -rupN --no-dereference gdal-3.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-01-14 22:27:26.561517435 +0100 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") diff --git a/sources b/sources index 91f3552..d34b03b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (gdal-3.10.0-fedora.tar.xz) = d17a6d5894847e03c3b8f5de55e87321d1fc848c8b822664b36b28abe1388fffd4288db5798a9261b46aa05d82903724a46af5752c9c7d7a42dfd063df2ee757 -SHA512 (gdalautotest-3.10.0.tar.gz) = 89ae4dfedb7f86405dc43c6ddeddbba569b050189fc85ae43521a1be4d71dd3fbc8e357b33753786d2ce921eaf9a1e9805d2a79a822885f462c526c4ba43ad00 +SHA512 (gdal-3.10.1-fedora.tar.xz) = 4296a467a8754ac684b731760dcc81825f8b1faf55cf98aedbc1cd5923153672cf56af0e88fab258b969a3600f0300ab6b89994a84be31fd04f6336b2d098901 From 2bc527eb6a783d18bf428ff2c6a72a7434487941 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Jan 2025 10:24:22 +0100 Subject: [PATCH 03/49] Fix sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index cbfe67d..71d3c8b 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ gdalautotest-1.7.0.tar.gz /gdal-3.10.0-fedora.tar.xz /gdalautotest-3.10.0.tar.gz /gdal-3.10.1-fedora.tar.xz +/gdalautotest-3.10.1.tar.gz diff --git a/sources b/sources index d34b03b..309e687 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (gdal-3.10.1-fedora.tar.xz) = 4296a467a8754ac684b731760dcc81825f8b1faf55cf98aedbc1cd5923153672cf56af0e88fab258b969a3600f0300ab6b89994a84be31fd04f6336b2d098901 +SHA512 (gdalautotest-3.10.1.tar.gz) = 1e7120ef24fece22e05c61f35d05fe5c18dac4c011e85537940457358ed62d53e3b391cb611c396448b6f4dafca15d78716cef2275d9557ab5a679d9240a260a From 565ce6e0534ca5c091b833fb7ae0a2900114bdfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:35:45 +0000 Subject: [PATCH 04/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index fe2be01..89f8a39 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -645,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Jan 14 2025 Sandro Mani - 3.10.1-1 - Update to 3.10.1 From 93adb52b9f29f80718dcc53fbb810ae73ce2e7fb Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 11 Feb 2025 11:48:58 +0100 Subject: [PATCH 05/49] Rebuild (poppler) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 89f8a39..29c099a 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -645,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Tue Feb 11 2025 Sandro Mani - 3.10.1-3 +- Rebuild (poppler) + * Thu Jan 16 2025 Fedora Release Engineering - 3.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b75d0ec0d46debccb4f7cf0be4a42d8a08aa7e5a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 11 Feb 2025 12:06:03 +0100 Subject: [PATCH 06/49] Backport patch to fix build against poppler 25.02.00 --- ...975d327d67394b6be03b22bd40c7e83db0cb.patch | 227 ++++++++++++++++++ gdal.spec | 2 + gdal_incompatible-pointer-types.patch | 2 +- gdal_utils.patch | 4 +- 4 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 9b99975d327d67394b6be03b22bd40c7e83db0cb.patch diff --git a/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch b/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch new file mode 100644 index 0000000..4841c73 --- /dev/null +++ b/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch @@ -0,0 +1,227 @@ +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfdataset.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfdataset.cpp +--- gdal-3.10.1-fedora/frmts/pdf/pdfdataset.cpp 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfdataset.cpp 2025-02-11 12:05:42.107459437 +0100 +@@ -1964,6 +1964,14 @@ CPLErr PDFDataset::ReadPixels(int nReqXO + PDFDoc *poDoc = m_poDocPoppler; + poSplashOut->startDoc(poDoc); + ++ // Note: Poppler 25.2 is certainly not the lowest version where we can ++ // avoid the hack. ++#if !(POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)) ++#define USE_OPTCONTENT_HACK ++#endif ++ ++#ifdef USE_OPTCONTENT_HACK + /* EVIL: we modify a private member... */ + /* poppler (at least 0.12 and 0.14 versions) don't render correctly */ + /* some PDFs and display an error message 'Could not find a OCG with +@@ -1978,6 +1986,7 @@ CPLErr PDFDataset::ReadPixels(int nReqXO + OCGs *poOldOCGs = poCatalog->optContent; + if (!m_bUseOCG) + poCatalog->optContent = nullptr; ++#endif + try + { + poDoc->displayPageSlice(poSplashOut, m_iPage, m_dfDPI, m_dfDPI, 0, +@@ -1988,14 +1997,19 @@ CPLErr PDFDataset::ReadPixels(int nReqXO + { + CPLError(CE_Failure, CPLE_AppDefined, + "PDFDoc::displayPageSlice() failed with %s", e.what()); ++ ++#ifdef USE_OPTCONTENT_HACK + /* Restore back */ + poCatalog->optContent = poOldOCGs; ++#endif + delete poSplashOut; + return CE_Failure; + } + ++#ifdef USE_OPTCONTENT_HACK + /* Restore back */ + poCatalog->optContent = poOldOCGs; ++#endif + + SplashBitmap *poBitmap = poSplashOut->getBitmap(); + if (poBitmap->getWidth() != nReqXSize || +@@ -3734,9 +3748,14 @@ void PDFDataset::ExploreLayersPoppler(GD + } + else + osCurLayer = std::move(osName); +- // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); ++ // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); + +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = ++ m_poDocPoppler->getOptContentConfig(); + struct Ref r; + r.num = poObj->GetRefNum().toInt(); + r.gen = poObj->GetRefGen(); +@@ -3772,11 +3791,19 @@ void PDFDataset::FindLayersPoppler(int i + if (poPages) + nPageCount = poPages->GetLength(); + +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); + if (optContentConfig == nullptr || !optContentConfig->isOk()) + return; + +- Array *array = optContentConfig->getOrderArray(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ Array *array = optContentConfig->getOrderArray(); + if (array) + { + GDALPDFArray *poArray = GDALPDFCreateArray(array); +@@ -3812,7 +3839,11 @@ void PDFDataset::FindLayersPoppler(int i + + void PDFDataset::TurnLayersOnOffPoppler() + { +- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ const ++#endif ++ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); + if (optContentConfig == nullptr || !optContentConfig->isOk()) + return; + +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfio.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfio.cpp +--- gdal-3.10.1-fedora/frmts/pdf/pdfio.cpp 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfio.cpp 2025-02-11 12:05:42.108975633 +0100 +@@ -237,23 +237,40 @@ int VSIPDFFileStream::lookChar() + /* reset() */ + /************************************************************************/ + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++bool VSIPDFFileStream::reset() ++#else + void VSIPDFFileStream::reset() ++#endif + { + nSavedPos = VSIFTellL(f); + bHasSavedPos = TRUE; + VSIFSeekL(f, nCurrentPos = nStart, SEEK_SET); + nPosInBuffer = -1; + nBufferLength = -1; ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ return true; ++#endif + } + + /************************************************************************/ + /* unfilteredReset() */ + /************************************************************************/ + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) ++bool VSIPDFFileStream::unfilteredReset() ++{ ++ return reset(); ++} ++#else + void VSIPDFFileStream::unfilteredReset() + { + reset(); + } ++#endif + + /************************************************************************/ + /* close() */ +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfio.h gdal-3.10.1-fedora-new/frmts/pdf/pdfio.h +--- gdal-3.10.1-fedora/frmts/pdf/pdfio.h 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfio.h 2025-02-11 12:05:42.109184996 +0100 +@@ -48,8 +48,20 @@ class VSIPDFFileStream final : public Ba + virtual int getUnfilteredChar() override; + virtual int lookChar() override; + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++ virtual bool reset() override; ++#else + virtual void reset() override; ++#endif ++ ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) ++ virtual bool unfilteredReset() override; ++#else + virtual void unfilteredReset() override; ++#endif ++ + virtual void close() override; + + bool FoundLinearizedHint() const +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfobject.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.cpp +--- gdal-3.10.1-fedora/frmts/pdf/pdfobject.cpp 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.cpp 2025-02-11 12:05:42.109467442 +0100 +@@ -979,13 +979,13 @@ class GDALPDFDictionaryPoppler : public + class GDALPDFArrayPoppler : public GDALPDFArray + { + private: +- Array *m_poArray; ++ const Array *m_poArray; + std::vector> m_v{}; + + CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayPoppler) + + public: +- GDALPDFArrayPoppler(Array *poArray) : m_poArray(poArray) ++ GDALPDFArrayPoppler(const Array *poArray) : m_poArray(poArray) + { + } + +@@ -1334,7 +1334,7 @@ std::map &GD + /* GDALPDFCreateArray() */ + /************************************************************************/ + +-GDALPDFArray *GDALPDFCreateArray(Array *array) ++GDALPDFArray *GDALPDFCreateArray(const Array *array) + { + return new GDALPDFArrayPoppler(array); + } +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfobject.h gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.h +--- gdal-3.10.1-fedora/frmts/pdf/pdfobject.h 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.h 2025-02-11 12:05:42.109835676 +0100 +@@ -405,7 +405,7 @@ class GDALPDFObjectPoppler : public GDAL + virtual int GetRefGen() override; + }; + +-GDALPDFArray *GDALPDFCreateArray(Array *array); ++GDALPDFArray *GDALPDFCreateArray(const Array *array); + + #endif // HAVE_POPPLER + +diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfsdk_headers_poppler.h gdal-3.10.1-fedora-new/frmts/pdf/pdfsdk_headers_poppler.h +--- gdal-3.10.1-fedora/frmts/pdf/pdfsdk_headers_poppler.h 2025-01-08 15:54:06.000000000 +0100 ++++ gdal-3.10.1-fedora-new/frmts/pdf/pdfsdk_headers_poppler.h 2025-02-11 12:05:42.110031975 +0100 +@@ -51,10 +51,15 @@ + + #include + +-#define private \ +- public /* Ugly! Catalog::optContent is private but we need it... */ ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) ++#include ++#else ++/* Ugly! Catalog::optContent is private but we need it for ancient Poppler versions. */ ++#define private public + #include + #undef private ++#endif + + #define private public /* Ugly! PDFDoc::str is private but we need it... */ + #include diff --git a/gdal.spec b/gdal.spec index 29c099a..626b36f 100644 --- a/gdal.spec +++ b/gdal.spec @@ -73,6 +73,8 @@ Source5: %{name}-cleaner.sh Patch0: gdal_utils.patch # Fix passing incompatible pointer type Patch1: gdal_incompatible-pointer-types.patch +# Fix build against Poppler 25.02.00 +Patch2: https://github.com/OSGeo/gdal/commit/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch BuildRequires: cmake BuildRequires: gcc-c++ diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index 4cbb9f2..bdc49ad 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp --- gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp 2025-01-14 22:27:26.805886705 +0100 ++++ gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp 2025-02-11 12:05:41.864960068 +0100 @@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif diff --git a/gdal_utils.patch b/gdal_utils.patch index a6f07e7..8acc136 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt --- gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-01-14 22:27:26.561168120 +0100 ++++ gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-02-11 12:05:41.611360679 +0100 @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -24,7 +24,7 @@ diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt gdal +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff -rupN --no-dereference gdal-3.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt --- gdal-3.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-01-14 22:27:26.561517435 +0100 ++++ gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-11 12:05:41.611651522 +0100 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") From bf35e9cb08b528c5c64a12dcb500a0839dca838e Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 13 Feb 2025 21:35:45 -0500 Subject: [PATCH 07/49] Rebuilt for libarrow 19 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 626b36f..4695fc3 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -647,6 +647,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Fri Feb 14 2025 Benjamin A. Beasley - 3.10.1-4 +- Rebuilt for libarrow 19 + * Tue Feb 11 2025 Sandro Mani - 3.10.1-3 - Rebuild (poppler) From c666a6931175bcb59854777d5888b37af0fee792 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 15 Feb 2025 07:18:26 +0100 Subject: [PATCH 08/49] Update to 3.10.2 --- .gitignore | 2 + ...975d327d67394b6be03b22bd40c7e83db0cb.patch | 227 ------------------ gdal.spec | 9 +- gdal_incompatible-pointer-types.patch | 6 +- gdal_utils.patch | 12 +- sources | 4 +- 6 files changed, 18 insertions(+), 242 deletions(-) delete mode 100644 9b99975d327d67394b6be03b22bd40c7e83db0cb.patch diff --git a/.gitignore b/.gitignore index 71d3c8b..3448ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.10.0.tar.gz /gdal-3.10.1-fedora.tar.xz /gdalautotest-3.10.1.tar.gz +/gdal-3.10.2-fedora.tar.xz +/gdalautotest-3.10.2.tar.gz diff --git a/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch b/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch deleted file mode 100644 index 4841c73..0000000 --- a/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfdataset.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfdataset.cpp ---- gdal-3.10.1-fedora/frmts/pdf/pdfdataset.cpp 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfdataset.cpp 2025-02-11 12:05:42.107459437 +0100 -@@ -1964,6 +1964,14 @@ CPLErr PDFDataset::ReadPixels(int nReqXO - PDFDoc *poDoc = m_poDocPoppler; - poSplashOut->startDoc(poDoc); - -+ // Note: Poppler 25.2 is certainly not the lowest version where we can -+ // avoid the hack. -+#if !(POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)) -+#define USE_OPTCONTENT_HACK -+#endif -+ -+#ifdef USE_OPTCONTENT_HACK - /* EVIL: we modify a private member... */ - /* poppler (at least 0.12 and 0.14 versions) don't render correctly */ - /* some PDFs and display an error message 'Could not find a OCG with -@@ -1978,6 +1986,7 @@ CPLErr PDFDataset::ReadPixels(int nReqXO - OCGs *poOldOCGs = poCatalog->optContent; - if (!m_bUseOCG) - poCatalog->optContent = nullptr; -+#endif - try - { - poDoc->displayPageSlice(poSplashOut, m_iPage, m_dfDPI, m_dfDPI, 0, -@@ -1988,14 +1997,19 @@ CPLErr PDFDataset::ReadPixels(int nReqXO - { - CPLError(CE_Failure, CPLE_AppDefined, - "PDFDoc::displayPageSlice() failed with %s", e.what()); -+ -+#ifdef USE_OPTCONTENT_HACK - /* Restore back */ - poCatalog->optContent = poOldOCGs; -+#endif - delete poSplashOut; - return CE_Failure; - } - -+#ifdef USE_OPTCONTENT_HACK - /* Restore back */ - poCatalog->optContent = poOldOCGs; -+#endif - - SplashBitmap *poBitmap = poSplashOut->getBitmap(); - if (poBitmap->getWidth() != nReqXSize || -@@ -3734,9 +3748,14 @@ void PDFDataset::ExploreLayersPoppler(GD - } - else - osCurLayer = std::move(osName); -- // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); -+ // CPLDebug("PDF", "Layer %s", osCurLayer.c_str()); - -- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ const -+#endif -+ OCGs *optContentConfig = -+ m_poDocPoppler->getOptContentConfig(); - struct Ref r; - r.num = poObj->GetRefNum().toInt(); - r.gen = poObj->GetRefGen(); -@@ -3772,11 +3791,19 @@ void PDFDataset::FindLayersPoppler(int i - if (poPages) - nPageCount = poPages->GetLength(); - -- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ const -+#endif -+ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); - if (optContentConfig == nullptr || !optContentConfig->isOk()) - return; - -- Array *array = optContentConfig->getOrderArray(); -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ const -+#endif -+ Array *array = optContentConfig->getOrderArray(); - if (array) - { - GDALPDFArray *poArray = GDALPDFCreateArray(array); -@@ -3812,7 +3839,11 @@ void PDFDataset::FindLayersPoppler(int i - - void PDFDataset::TurnLayersOnOffPoppler() - { -- OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ const -+#endif -+ OCGs *optContentConfig = m_poDocPoppler->getOptContentConfig(); - if (optContentConfig == nullptr || !optContentConfig->isOk()) - return; - -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfio.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfio.cpp ---- gdal-3.10.1-fedora/frmts/pdf/pdfio.cpp 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfio.cpp 2025-02-11 12:05:42.108975633 +0100 -@@ -237,23 +237,40 @@ int VSIPDFFileStream::lookChar() - /* reset() */ - /************************************************************************/ - -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+bool VSIPDFFileStream::reset() -+#else - void VSIPDFFileStream::reset() -+#endif - { - nSavedPos = VSIFTellL(f); - bHasSavedPos = TRUE; - VSIFSeekL(f, nCurrentPos = nStart, SEEK_SET); - nPosInBuffer = -1; - nBufferLength = -1; -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ return true; -+#endif - } - - /************************************************************************/ - /* unfilteredReset() */ - /************************************************************************/ - -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) -+bool VSIPDFFileStream::unfilteredReset() -+{ -+ return reset(); -+} -+#else - void VSIPDFFileStream::unfilteredReset() - { - reset(); - } -+#endif - - /************************************************************************/ - /* close() */ -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfio.h gdal-3.10.1-fedora-new/frmts/pdf/pdfio.h ---- gdal-3.10.1-fedora/frmts/pdf/pdfio.h 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfio.h 2025-02-11 12:05:42.109184996 +0100 -@@ -48,8 +48,20 @@ class VSIPDFFileStream final : public Ba - virtual int getUnfilteredChar() override; - virtual int lookChar() override; - -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+ virtual bool reset() override; -+#else - virtual void reset() override; -+#endif -+ -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2) -+ virtual bool unfilteredReset() override; -+#else - virtual void unfilteredReset() override; -+#endif -+ - virtual void close() override; - - bool FoundLinearizedHint() const -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfobject.cpp gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.cpp ---- gdal-3.10.1-fedora/frmts/pdf/pdfobject.cpp 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.cpp 2025-02-11 12:05:42.109467442 +0100 -@@ -979,13 +979,13 @@ class GDALPDFDictionaryPoppler : public - class GDALPDFArrayPoppler : public GDALPDFArray - { - private: -- Array *m_poArray; -+ const Array *m_poArray; - std::vector> m_v{}; - - CPL_DISALLOW_COPY_ASSIGN(GDALPDFArrayPoppler) - - public: -- GDALPDFArrayPoppler(Array *poArray) : m_poArray(poArray) -+ GDALPDFArrayPoppler(const Array *poArray) : m_poArray(poArray) - { - } - -@@ -1334,7 +1334,7 @@ std::map &GD - /* GDALPDFCreateArray() */ - /************************************************************************/ - --GDALPDFArray *GDALPDFCreateArray(Array *array) -+GDALPDFArray *GDALPDFCreateArray(const Array *array) - { - return new GDALPDFArrayPoppler(array); - } -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfobject.h gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.h ---- gdal-3.10.1-fedora/frmts/pdf/pdfobject.h 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfobject.h 2025-02-11 12:05:42.109835676 +0100 -@@ -405,7 +405,7 @@ class GDALPDFObjectPoppler : public GDAL - virtual int GetRefGen() override; - }; - --GDALPDFArray *GDALPDFCreateArray(Array *array); -+GDALPDFArray *GDALPDFCreateArray(const Array *array); - - #endif // HAVE_POPPLER - -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/pdf/pdfsdk_headers_poppler.h gdal-3.10.1-fedora-new/frmts/pdf/pdfsdk_headers_poppler.h ---- gdal-3.10.1-fedora/frmts/pdf/pdfsdk_headers_poppler.h 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/pdf/pdfsdk_headers_poppler.h 2025-02-11 12:05:42.110031975 +0100 -@@ -51,10 +51,15 @@ - - #include - --#define private \ -- public /* Ugly! Catalog::optContent is private but we need it... */ -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2) -+#include -+#else -+/* Ugly! Catalog::optContent is private but we need it for ancient Poppler versions. */ -+#define private public - #include - #undef private -+#endif - - #define private public /* Ugly! PDFDoc::str is private but we need it... */ - #include diff --git a/gdal.spec b/gdal.spec index 4695fc3..91371b5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.10.1 -Release: 4%{?dist} +Version: 3.10.2 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -73,8 +73,6 @@ Source5: %{name}-cleaner.sh Patch0: gdal_utils.patch # Fix passing incompatible pointer type Patch1: gdal_incompatible-pointer-types.patch -# Fix build against Poppler 25.02.00 -Patch2: https://github.com/OSGeo/gdal/commit/9b99975d327d67394b6be03b22bd40c7e83db0cb.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -647,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Sat Feb 15 2025 Sandro Mani - 3.10.2-1 +- Update to 3.10.2 + * Fri Feb 14 2025 Benjamin A. Beasley - 3.10.1-4 - Rebuilt for libarrow 19 diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index bdc49ad..b497a63 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp ---- gdal-3.10.1-fedora/port/cpl_vsil_win32.cpp 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/port/cpl_vsil_win32.cpp 2025-02-11 12:05:41.864960068 +0100 +diff -rupN --no-dereference gdal-3.10.2-fedora/port/cpl_vsil_win32.cpp gdal-3.10.2-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.10.2-fedora/port/cpl_vsil_win32.cpp 2025-02-11 12:10:04.000000000 +0100 ++++ gdal-3.10.2-fedora-new/port/cpl_vsil_win32.cpp 2025-02-15 07:17:31.885707137 +0100 @@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif diff --git a/gdal_utils.patch b/gdal_utils.patch index 8acc136..bd45d88 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.10.1-fedora/frmts/iso8211/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-02-11 12:05:41.611360679 +0100 +diff -rupN --no-dereference gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 ++++ gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt 2025-02-15 07:17:31.661793475 +0100 @@ -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.10.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.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.10.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-01-08 15:54:06.000000000 +0100 -+++ gdal-3.10.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-11 12:05:41.611651522 +0100 +diff -rupN --no-dereference gdal-3.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 ++++ gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-15 07:17:31.662050788 +0100 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") diff --git a/sources b/sources index 309e687..d0abeeb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.10.1-fedora.tar.xz) = 4296a467a8754ac684b731760dcc81825f8b1faf55cf98aedbc1cd5923153672cf56af0e88fab258b969a3600f0300ab6b89994a84be31fd04f6336b2d098901 -SHA512 (gdalautotest-3.10.1.tar.gz) = 1e7120ef24fece22e05c61f35d05fe5c18dac4c011e85537940457358ed62d53e3b391cb611c396448b6f4dafca15d78716cef2275d9557ab5a679d9240a260a +SHA512 (gdal-3.10.2-fedora.tar.xz) = 87cdd7f8a33d9387eb4b38bab374bcfa6c728174e71e32bfc991b1680af38c3e9b4c07cbad83093c8902e314ee2b9cd565efb51d54f017d48cf8c0fe7dfc918b +SHA512 (gdalautotest-3.10.2.tar.gz) = 260965abc9c5b46b2365e436167699f10d8e5e8d937bc6ee28b9295c558c064ce63851f7594ac9a29edbfae7615cb642ba7a8a53db84b074c49a589835394c40 From 8c749deb757af737931f029b843d523a3311b341 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 20 Feb 2025 11:17:48 +0100 Subject: [PATCH 09/49] Rebuild for libarrow 19 in poppler's sidetag --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 91371b5..391c483 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -645,6 +645,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Feb 20 2025 Marek Kasik - 3.10.2-2 +- Rebuild for libarrow 19 in poppler's sidetag + * Sat Feb 15 2025 Sandro Mani - 3.10.2-1 - Update to 3.10.2 From 2f7e4bef1f0126a5f71786d819927b2020f90df6 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 20 Feb 2025 15:09:21 +0100 Subject: [PATCH 10/49] Add definitions of missing int16_t and int32_t --- gdal-3.10.2-integer-types.patch | 10 ++++++++++ gdal.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gdal-3.10.2-integer-types.patch diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch new file mode 100644 index 0000000..bbcd633 --- /dev/null +++ b/gdal-3.10.2-integer-types.patch @@ -0,0 +1,10 @@ +--- gdal-3.10.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ++++ gdal-3.10.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) + // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string diff --git a/gdal.spec b/gdal.spec index 391c483..f027c26 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -73,6 +73,8 @@ Source5: %{name}-cleaner.sh Patch0: gdal_utils.patch # Fix passing incompatible pointer type Patch1: gdal_incompatible-pointer-types.patch +# Add definitions of missing int16_t and int32_t +Patch2: gdal-3.10.2-integer-types.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -645,6 +647,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Feb 20 2025 Marek Kasik - 3.10.2-3 +- Add definitions of missing int16_t and int32_t + * Thu Feb 20 2025 Marek Kasik - 3.10.2-2 - Rebuild for libarrow 19 in poppler's sidetag From 00acea5160e54d231bd8a6603be669e666fffbda Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 26 Feb 2025 12:52:39 +0100 Subject: [PATCH 11/49] Rebuild (poppler) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index f027c26..361c18a 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -647,6 +647,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Wed Feb 26 2025 Sandro Mani - 3.10.2-4 +- Rebuild (poppler) + * Thu Feb 20 2025 Marek Kasik - 3.10.2-3 - Add definitions of missing int16_t and int32_t From db98046d348c0582c0a58c2fe8a95016643e7da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 27 Feb 2025 16:35:50 +0200 Subject: [PATCH 12/49] Enable blosc --- gdal.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 361c18a..ea9f217 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal Version: 3.10.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -81,6 +81,7 @@ BuildRequires: gcc-c++ BuildRequires: armadillo-devel BuildRequires: bison +BuildRequires: blosc-devel BuildRequires: cfitsio-devel BuildRequires: CharLS-devel BuildRequires: curl-devel @@ -647,6 +648,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Feb 27 2025 Laurențiu Nicola - 3.10.2-5 +- Enable blosc + * Wed Feb 26 2025 Sandro Mani - 3.10.2-4 - Rebuild (poppler) From 899461ad981ec571209e0bed1b3353667c5a34e9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 7 Apr 2025 13:47:17 +0200 Subject: [PATCH 13/49] Update to 3.10.3 --- .gitignore | 2 ++ gdal-3.10.2-integer-types.patch | 5 +++-- gdal.spec | 7 +++++-- gdal_incompatible-pointer-types.patch | 6 +++--- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 3448ee1..31914c4 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.10.1.tar.gz /gdal-3.10.2-fedora.tar.xz /gdalautotest-3.10.2.tar.gz +/gdal-3.10.3-fedora.tar.xz +/gdalautotest-3.10.3.tar.gz diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch index bbcd633..dfad44c 100644 --- a/gdal-3.10.2-integer-types.patch +++ b/gdal-3.10.2-integer-types.patch @@ -1,5 +1,6 @@ ---- gdal-3.10.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp -+++ gdal-3.10.2-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +--- gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-01 13:03:21.000000000 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-07 13:39:47.674069257 +0200 @@ -23,6 +23,7 @@ #include #include diff --git a/gdal.spec b/gdal.spec index ea9f217..74866e5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -50,8 +50,8 @@ Name: gdal -Version: 3.10.2 -Release: 5%{?dist} +Version: 3.10.3 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -648,6 +648,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Mon Apr 07 2025 Sandro Mani - 3.10.3-1 +- Update to 3.10.3 + * Thu Feb 27 2025 Laurențiu Nicola - 3.10.2-5 - Enable blosc diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index b497a63..f70e12e 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.10.2-fedora/port/cpl_vsil_win32.cpp gdal-3.10.2-fedora-new/port/cpl_vsil_win32.cpp ---- gdal-3.10.2-fedora/port/cpl_vsil_win32.cpp 2025-02-11 12:10:04.000000000 +0100 -+++ gdal-3.10.2-fedora-new/port/cpl_vsil_win32.cpp 2025-02-15 07:17:31.885707137 +0100 +diff -rupN --no-dereference gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp 2025-04-01 13:03:22.000000000 +0200 ++++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-04-07 13:39:47.318116680 +0200 @@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif diff --git a/gdal_utils.patch b/gdal_utils.patch index bd45d88..3128eba 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.10.2-fedora/frmts/iso8211/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 -+++ gdal-3.10.2-fedora-new/frmts/iso8211/CMakeLists.txt 2025-02-15 07:17:31.661793475 +0100 +diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt 2025-04-01 13:03:21.000000000 +0200 ++++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-04-07 13:39:46.951980413 +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.10.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.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.10.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-11 12:10:04.000000000 +0100 -+++ gdal-3.10.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-02-15 07:17:31.662050788 +0100 +diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-01 13:03:22.000000000 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-07 13:39:46.952461833 +0200 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") diff --git a/sources b/sources index d0abeeb..0ddc2fd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.10.2-fedora.tar.xz) = 87cdd7f8a33d9387eb4b38bab374bcfa6c728174e71e32bfc991b1680af38c3e9b4c07cbad83093c8902e314ee2b9cd565efb51d54f017d48cf8c0fe7dfc918b -SHA512 (gdalautotest-3.10.2.tar.gz) = 260965abc9c5b46b2365e436167699f10d8e5e8d937bc6ee28b9295c558c064ce63851f7594ac9a29edbfae7615cb642ba7a8a53db84b074c49a589835394c40 +SHA512 (gdal-3.10.3-fedora.tar.xz) = 1dced4c7a62ce74323e26d859b4fe82b67f660ab65c2a44f8de35771b7d9dca73b2d1d8c0497588b686bd3b5ea05045caa9558e19618e4c2b2bea3bf03781483 +SHA512 (gdalautotest-3.10.3.tar.gz) = af8637944498adfbc33b26f747bab0ad6b46216c58a994248ad8e252c90c6050709bef1b0c15986edfb6a87ee7d09bac8fd837266b5deb8980409bb018037c60 From 770433fc76596b9a4a42510a3142582720ff7869 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Thu, 6 Mar 2025 14:49:46 +0100 Subject: [PATCH 14/49] Prepare spec file to be compatible with RHEL Changes applicable to non-fedora distros: Remove as much dependencies as possible. None of the dependencies removed are present in RHEL currently, so they have to go. Basically we are creating minimal build which would be compatible with RHEL without new dependencies that would need adding to RHEL repos. --- gdal.spec | 255 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 141 insertions(+), 114 deletions(-) diff --git a/gdal.spec b/gdal.spec index 74866e5..9b8673e 100644 --- a/gdal.spec +++ b/gdal.spec @@ -79,21 +79,36 @@ Patch2: gdal-3.10.2-integer-types.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: armadillo-devel BuildRequires: bison +BuildRequires: curl-devel +BuildRequires: expat-devel +BuildRequires: geos-devel +BuildRequires: json-c-devel +BuildRequires: libarchive-devel +BuildRequires: libpng-devel +BuildRequires: libpq-devel +BuildRequires: libtiff-devel +BuildRequires: libtirpc-devel +BuildRequires: mariadb-connector-c-devel +BuildRequires: openjpeg2-devel +BuildRequires: pcre2-devel +BuildRequires: proj-devel >= 5.2.0 +BuildRequires: sqlite-devel +BuildRequires: swig +BuildRequires: unixODBC-devel +BuildRequires: xz-devel +BuildRequires: zlib-devel + +%if 0%{?fedora} +BuildRequires: armadillo-devel BuildRequires: blosc-devel BuildRequires: cfitsio-devel BuildRequires: CharLS-devel -BuildRequires: curl-devel -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 BuildRequires: libarrow-dataset-devel @@ -105,13 +120,9 @@ BuildRequires: libgta-devel BuildRequires: libjpeg-devel BuildRequires: libkml-devel BuildRequires: liblerc-devel -BuildRequires: libpng-devel -BuildRequires: libpq-devel %if %{with_spatialite} BuildRequires: libspatialite-devel %endif -BuildRequires: libtiff-devel -BuildRequires: libtirpc-devel BuildRequires: libwebp-devel BuildRequires: libzstd-devel %if 0%{?with_mysql} @@ -120,27 +131,50 @@ BuildRequires: mariadb-connector-c-devel BuildRequires: netcdf-devel BuildRequires: ogdi-devel BuildRequires: openexr-devel -BuildRequires: openjpeg2-devel -%if 0%{?fedora} BuildRequires: openssl-devel-engine -%else -BuildRequires: openssl-devel -%endif %ifnarch %{ix86} %{arm} BuildRequires: parquet-libs-devel %endif -BuildRequires: pcre2-devel %if 0%{?with_poppler} BuildRequires: poppler-devel %endif -BuildRequires: proj-devel >= 5.2.0 BuildRequires: qhull-devel -BuildRequires: sqlite-devel -BuildRequires: swig -BuildRequires: unixODBC-devel BuildRequires: xerces-c-devel -BuildRequires: xz-devel -BuildRequires: zlib-devel + +# Python +%if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-filelock +BuildRequires: python3-numpy +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 + +BuildRequires: mingw64-python3 +BuildRequires: mingw64-python3-numpy +BuildRequires: mingw64-python3-setuptools +%endif +%endif + +# Java +%if %{with java} +# For 'mvn_artifact' and 'mvn_install' +BuildRequires: ant +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local +BuildRequires: jpackage-utils +%endif +Requires: gpsbabel +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +%else +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel +%endif %if %{with mingw} BuildRequires: mingw32-filesystem >= 102 @@ -206,39 +240,6 @@ BuildRequires: mingw64-zlib BuildRequires: mingw64-zstd %endif -# Python -%if %{with python3} -BuildRequires: python3-devel -BuildRequires: python3-filelock -BuildRequires: python3-numpy -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 - -BuildRequires: mingw64-python3 -BuildRequires: mingw64-python3-numpy -BuildRequires: mingw64-python3-setuptools -%endif -%endif - -# Java -%if %{with java} -# For 'mvn_artifact' and 'mvn_install' -BuildRequires: ant -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: javapackages-local -BuildRequires: jpackage-utils -%endif - -# Run time dependency for gpsbabel driver -Requires: gpsbabel -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - %description Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform @@ -268,6 +269,49 @@ Provides: bundled(degrib) = 2.14 %description libs This package contains the GDAL file format library. +%if 0%{?fedora} +# No complete java yet in EL8 +%if %{with java} +%package java +Summary: Java modules for the GDAL file format library +Requires: jpackage-utils +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description java +The GDAL Java modules provide support to handle multiple GIS file formats. + + +%package javadoc +Summary: Javadocs for %{name} +Requires: jpackage-utils +BuildArch: noarch + +%description javadoc +This package contains the API documentation for %{name}. +%endif + + +%if %{with python3} +%package -n python3-gdal +%{?python_provide:%python_provide python3-gdal} +Summary: Python modules for the GDAL file format library +Requires: python3-numpy +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description -n python3-gdal +The GDAL Python 3 modules provide support to handle multiple GIS file formats. + + +%package python-tools +Summary: Python tools for the GDAL file format library +Requires: python3-gdal + +%description python-tools +The GDAL Python package provides number of tools for programming and +manipulating GDAL file format library + +%endif + %if %{with mingw} %package -n mingw32-%{name} Summary: MinGW Windows GDAL library @@ -309,47 +353,6 @@ BuildArch: noarch MinGW Windows GDAL library tools. %endif -# No complete java yet in EL8 -%if %{with java} -%package java -Summary: Java modules for the GDAL file format library -Requires: jpackage-utils -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description java -The GDAL Java modules provide support to handle multiple GIS file formats. - - -%package javadoc -Summary: Javadocs for %{name} -Requires: jpackage-utils -BuildArch: noarch - -%description javadoc -This package contains the API documentation for %{name}. -%endif - - -%if %{with python3} -%package -n python3-gdal -%{?python_provide:%python_provide python3-gdal} -Summary: Python modules for the GDAL file format library -Requires: python3-numpy -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -n python3-gdal -The GDAL Python 3 modules provide support to handle multiple GIS file formats. - - -%package python-tools -Summary: Python tools for the GDAL file format library -Requires: python3-gdal - -%description python-tools -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 @@ -402,8 +405,23 @@ cp -a %{SOURCE4} . %build %cmake \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ +%if 0%{?fedora} -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ +%endif +%if ! 0%{?fedora} + -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ + -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \ + -DGDAL_USE_JPEG=ON \ + -DGDAL_USE_JPEG_INTERNAL=OFF \ + -DGDAL_USE_GOOGLETEST=OFF \ + -DGDAL_USE_LERC=OFF \ + -DGDAL_USE_LERC_INTERNAL=OFF \ + -DGDAL_USE_GEOTIFF=OFF \ + -DGDAL_USE_GEOTIFF_INTERNAL=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF \ + -DBUILD_TESTING=OFF \ +%endif -DGDAL_USE_JPEG12_INTERNAL=OFF \ -DENABLE_DEFLATE64=OFF %cmake_build @@ -456,21 +474,18 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %endif +%if 0%{?fedora} %files -f gdal_python_manpages_excludes.txt -%{_bindir}/8211* -%{_bindir}/gdal2tiles -%{_bindir}/gdal2xyz +%else +%files +%endif + %{_bindir}/gdaladdo -%{_bindir}/gdalattachpct %{_bindir}/gdalbuildvrt -%{_bindir}/gdal_calc -%{_bindir}/gdalcompare %{_bindir}/gdal_contour %{_bindir}/gdal_create %{_bindir}/gdaldem -%{_bindir}/gdal_edit %{_bindir}/gdalenhance -%{_bindir}/gdal_fillnodata %{_bindir}/gdal_footprint %{_bindir}/gdal_grid %{_bindir}/gdalinfo @@ -478,14 +493,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/gdalmanage %{_bindir}/gdalmdiminfo %{_bindir}/gdalmdimtranslate -%{_bindir}/gdal_merge -%{_bindir}/gdalmove -%{_bindir}/gdal_pansharpen -%{_bindir}/gdal_polygonize -%{_bindir}/gdal_proximity %{_bindir}/gdal_rasterize -%{_bindir}/gdal_retile -%{_bindir}/gdal_sieve %{_bindir}/gdalsrsinfo %{_bindir}/gdaltindex %{_bindir}/gdaltransform @@ -497,14 +505,31 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/nearblack %{_bindir}/ogr2ogr %{_bindir}/ogrinfo -%{_bindir}/ogr_layer_algebra %{_bindir}/ogrlineref -%{_bindir}/ogrmerge %{_bindir}/ogrtindex +%{_bindir}/sozip +%if 0%{?fedora} +%{_bindir}/8211* +%{_bindir}/gdal2tiles +%{_bindir}/gdal2xyz +%{_bindir}/gdalattachpct +%{_bindir}/gdal_calc +%{_bindir}/gdalcompare +%{_bindir}/gdal_edit +%{_bindir}/gdal_fillnodata +%{_bindir}/gdal_merge +%{_bindir}/gdalmove +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_proximity +%{_bindir}/gdal_retile +%{_bindir}/gdal_sieve +%{_bindir}/ogr_layer_algebra +%{_bindir}/ogrmerge %{_bindir}/pct2rgb %{_bindir}/rgb2pct %{_bindir}/s57dump -%{_bindir}/sozip +%endif %{_datadir}/bash-completion/completions/* %exclude %{_datadir}/bash-completion/completions/*.py %{_mandir}/man1/* @@ -592,6 +617,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{mingw64_bindir}/rgb2pct %endif +%if 0%{?fedora} %if %{with python3} %files -n python3-gdal %doc swig/python/README.rst @@ -645,6 +671,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files javadoc %{_jnidir}/%{name}/gdal-%{version}-javadoc.jar %endif +%endif %changelog From 529be833d45b806c3bb9c381b09e94f16c5c7cd5 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Apr 2025 00:30:12 +0200 Subject: [PATCH 15/49] Cleanup conditionals and fix %%files --- gdal.spec | 315 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 184 insertions(+), 131 deletions(-) diff --git a/gdal.spec b/gdal.spec index 9b8673e..b653876 100644 --- a/gdal.spec +++ b/gdal.spec @@ -28,22 +28,18 @@ %global spatialite "--with-spatialite" %endif +%if 0%{?fedora} +%bcond_without mingw %bcond_without python3 -# No complete java yet in EL8 -%if 0%{?rhel} == 8 -%bcond_with java -%else %ifarch %{java_arches} %bcond_without java %else %bcond_with java %endif -%endif - -%if 0%{?fedora} -%bcond_without mingw %else %bcond_with mingw +%bcond_with python3 +%bcond_with java %endif #global pre rc1 @@ -100,6 +96,7 @@ BuildRequires: xz-devel BuildRequires: zlib-devel %if 0%{?fedora} +# Fedora dependencies BuildRequires: armadillo-devel BuildRequires: blosc-devel BuildRequires: cfitsio-devel @@ -140,6 +137,11 @@ BuildRequires: poppler-devel %endif BuildRequires: qhull-devel BuildRequires: xerces-c-devel +%else +# RHEL dependencies +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel +%endif # Python %if %{with python3} @@ -149,16 +151,6 @@ BuildRequires: python3-numpy 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 - -BuildRequires: mingw64-python3 -BuildRequires: mingw64-python3-numpy -BuildRequires: mingw64-python3-setuptools -%endif %endif # Java @@ -169,15 +161,10 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: javapackages-local BuildRequires: jpackage-utils %endif -Requires: gpsbabel -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%else -BuildRequires: libjpeg-turbo-devel -BuildRequires: openssl-devel -%endif +# MinGW %if %{with mingw} -BuildRequires: mingw32-filesystem >= 102 +BuildRequires: mingw32-filesystem BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-cfitsio BuildRequires: mingw32-curl @@ -207,8 +194,13 @@ BuildRequires: mingw32-xerces-c BuildRequires: mingw32-xz-libs BuildRequires: mingw32-zlib BuildRequires: mingw32-zstd +%if %{with python3} +BuildRequires: mingw32-python3 +BuildRequires: mingw32-python3-numpy +BuildRequires: mingw32-python3-setuptools +%endif -BuildRequires: mingw64-filesystem >= 102 +BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-cfitsio BuildRequires: mingw64-curl @@ -238,7 +230,17 @@ BuildRequires: mingw64-xerces-c BuildRequires: mingw64-xz-libs BuildRequires: mingw64-zlib BuildRequires: mingw64-zstd +%if %{with python3} +BuildRequires: mingw64-python3 +BuildRequires: mingw64-python3-numpy +BuildRequires: mingw64-python3-setuptools %endif +%endif + +%if 0%{?fedora} +Requires: gpsbabel +%endif +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description @@ -269,8 +271,7 @@ Provides: bundled(degrib) = 2.14 %description libs This package contains the GDAL file format library. -%if 0%{?fedora} -# No complete java yet in EL8 + %if %{with java} %package java Summary: Java modules for the GDAL file format library @@ -310,8 +311,11 @@ Requires: python3-gdal The GDAL Python package provides number of tools for programming and manipulating GDAL file format library +# We don't want to provide private Python extension libs +%global __provides_exclude_from ^%{python3_sitearch}/.*\.so$ %endif + %if %{with mingw} %package -n mingw32-%{name} Summary: MinGW Windows GDAL library @@ -333,6 +337,15 @@ BuildArch: noarch MinGW Windows GDAL library tools. +%if %{with python3} +%package -n mingw32-python3-%{name} +Summary: MinGW Windows Python3 GDAL bindings + +%description -n mingw32-python3-%{name} +MinGW Windows Python3 GDAL bindings. +%endif + + %package -n mingw64-%{name} Summary: MinGW Windows GDAL library # GDAL bundles a modified copy of g2clib and degrib @@ -351,16 +364,9 @@ BuildArch: noarch %description -n mingw64-%{name}-tools MinGW Windows GDAL library tools. -%endif - -%if %{with mingw} -%package -n mingw32-python3-%{name} -Summary: MinGW Windows Python3 GDAL bindings - -%description -n mingw32-python3-%{name} -MinGW Windows Python3 GDAL bindings. +%if %{with python3} %package -n mingw64-python3-%{name} Summary: MinGW Windows Python3 GDAL bindings @@ -368,12 +374,6 @@ Summary: MinGW Windows Python3 GDAL bindings 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 @@ -405,7 +405,7 @@ cp -a %{SOURCE4} . %build %cmake \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ -%if 0%{?fedora} +%if %{with java} -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ %endif @@ -438,22 +438,23 @@ cp -a %{SOURCE4} . %install %cmake_install +# FIXME These should not be installed, the counterparts without the *.py suffix are the wanted ones +rm -f %{buildroot}%{_bindir}/*.py +# FIXME Fix bash-completion filenames +for file in %{buildroot}%{_datadir}/bash-completion/completions/*.py; do + mv $file ${file/.py/} +done %if %{with mingw} %mingw_make_install +# FIXME These should not be installed, the counterparts without the *.py suffix are the wanted ones +rm -f %{buildroot}%{mingw32_bindir}/*.py +rm -f %{buildroot}%{mingw64_bindir}/*.py # 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 - if [ -f %{buildroot}%{_mandir}/man1/`basename ${file/.py/.1*}` ]; then - echo "%{_mandir}/man1/`basename ${file/.py/.1*}`" >> gdal_python_manpages.txt - echo "%exclude %{_mandir}/man1/`basename ${file/.py/.1*}`" >> gdal_python_manpages_excludes.txt - fi -done - # Multilib # - cpl_config.h is arch-dependent (contains various SIZEOF defines) # - gdal-config stores arch-specific information @@ -474,12 +475,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %endif -%if 0%{?fedora} -%files -f gdal_python_manpages_excludes.txt -%else %files -%endif - %{_bindir}/gdaladdo %{_bindir}/gdalbuildvrt %{_bindir}/gdal_contour @@ -510,31 +506,59 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/sozip %if 0%{?fedora} %{_bindir}/8211* -%{_bindir}/gdal2tiles -%{_bindir}/gdal2xyz -%{_bindir}/gdalattachpct -%{_bindir}/gdal_calc -%{_bindir}/gdalcompare -%{_bindir}/gdal_edit -%{_bindir}/gdal_fillnodata -%{_bindir}/gdal_merge -%{_bindir}/gdalmove -%{_bindir}/gdal_pansharpen -%{_bindir}/gdal_polygonize -%{_bindir}/gdal_proximity -%{_bindir}/gdal_retile -%{_bindir}/gdal_sieve -%{_bindir}/ogr_layer_algebra -%{_bindir}/ogrmerge -%{_bindir}/pct2rgb -%{_bindir}/rgb2pct %{_bindir}/s57dump %endif -%{_datadir}/bash-completion/completions/* -%exclude %{_datadir}/bash-completion/completions/*.py -%{_mandir}/man1/* -%exclude %{_mandir}/man1/gdal-config.1* -# Python manpages excluded in -f gdal_python_manpages_excludes.txt +%{_datadir}/bash-completion/completions/gdaladdo +%{_datadir}/bash-completion/completions/gdalbuildvrt +%{_datadir}/bash-completion/completions/gdal-config +%{_datadir}/bash-completion/completions/gdal_contour +%{_datadir}/bash-completion/completions/gdal_create +%{_datadir}/bash-completion/completions/gdaldem +%{_datadir}/bash-completion/completions/gdalenhance +%{_datadir}/bash-completion/completions/gdal_grid +%{_datadir}/bash-completion/completions/gdalinfo +%{_datadir}/bash-completion/completions/gdallocationinfo +%{_datadir}/bash-completion/completions/gdalmanage +%{_datadir}/bash-completion/completions/gdal_rasterize +%{_datadir}/bash-completion/completions/gdalsrsinfo +%{_datadir}/bash-completion/completions/gdaltindex +%{_datadir}/bash-completion/completions/gdaltransform +%{_datadir}/bash-completion/completions/gdal_translate +%{_datadir}/bash-completion/completions/gdal_viewshed +%{_datadir}/bash-completion/completions/gdalwarp +%{_datadir}/bash-completion/completions/ogr2ogr +%{_datadir}/bash-completion/completions/ogrinfo +%{_datadir}/bash-completion/completions/ogrlineref +%{_datadir}/bash-completion/completions/ogrtindex +%{_mandir}/man1/gdaladdo.1.* +%{_mandir}/man1/gdalbuildvrt.1.* +%{_mandir}/man1/gdal-config.1.* +%{_mandir}/man1/gdal_contour.1.* +%{_mandir}/man1/gdal_create.1.* +%{_mandir}/man1/gdaldem.1.* +%{_mandir}/man1/gdal_footprint.1.* +%{_mandir}/man1/gdal_grid.1.* +%{_mandir}/man1/gdalinfo.1.* +%{_mandir}/man1/gdallocationinfo.1.* +%{_mandir}/man1/gdalmanage.1.* +%{_mandir}/man1/gdalmdiminfo.1.* +%{_mandir}/man1/gdalmdimtranslate.1.* +%{_mandir}/man1/gdal_rasterize.1.* +%{_mandir}/man1/gdalsrsinfo.1.* +%{_mandir}/man1/gdaltindex.1.* +%{_mandir}/man1/gdaltransform.1.* +%{_mandir}/man1/gdal_translate.1.* +%{_mandir}/man1/gdal_viewshed.1.* +%{_mandir}/man1/gdalwarp.1.* +%{_mandir}/man1/gnmanalyse.1.* +%{_mandir}/man1/gnmmanage.1.* +%{_mandir}/man1/nearblack.1.* +%{_mandir}/man1/ogr2ogr.1.* +%{_mandir}/man1/ogrinfo.1.* +%{_mandir}/man1/ogrlineref.1.* +%{_mandir}/man1/ogrmerge.1.* +%{_mandir}/man1/ogrtindex.1.* +%{_mandir}/man1/sozip.1.* %files libs %license LICENSE.TXT @@ -553,6 +577,77 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_libdir}/pkgconfig/%{name}.pc %{_mandir}/man1/gdal-config.1* +%if %{with java} +%files java +%{_jnidir}/%{name}/gdal-%{version}-sources.jar +%{_jnidir}/%{name}/gdal-%{version}.jar +%{_jnidir}/%{name}/gdal-%{version}.pom +%{_jnidir}/%{name}/libgdalalljni.so + +%files javadoc +%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar +%endif + +%if %{with python3} +%files -n python3-gdal +%doc swig/python/README.rst +%{python3_sitearch}/GDAL-%{version}-py*.egg-info/ +%{python3_sitearch}/osgeo/ +%{python3_sitearch}/osgeo_utils/ + +%files python-tools +%{_bindir}/gdal2tiles +%{_bindir}/gdal2xyz +%{_bindir}/gdalattachpct +%{_bindir}/gdal_calc +%{_bindir}/gdalcompare +%{_bindir}/gdal_edit +%{_bindir}/gdal_fillnodata +%{_bindir}/gdal_merge +%{_bindir}/gdalmove +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_proximity +%{_bindir}/gdal_retile +%{_bindir}/gdal_sieve +%{_bindir}/ogr_layer_algebra +%{_bindir}/ogrmerge +%{_bindir}/pct2rgb +%{_bindir}/rgb2pct +%{_datadir}/bash-completion/completions/gdal2tiles +%{_datadir}/bash-completion/completions/gdal2xyz +%{_datadir}/bash-completion/completions/gdal_calc +%{_datadir}/bash-completion/completions/gdalchksum +%{_datadir}/bash-completion/completions/gdalcompare +%{_datadir}/bash-completion/completions/gdal_edit +%{_datadir}/bash-completion/completions/gdal_fillnodata +%{_datadir}/bash-completion/completions/gdalident +%{_datadir}/bash-completion/completions/gdalimport +%{_datadir}/bash-completion/completions/gdal_merge +%{_datadir}/bash-completion/completions/gdalmove +%{_datadir}/bash-completion/completions/gdal_polygonize +%{_datadir}/bash-completion/completions/gdal_proximity +%{_datadir}/bash-completion/completions/gdal_retile +%{_datadir}/bash-completion/completions/gdal_sieve +%{_datadir}/bash-completion/completions/ogrmerge +%{_mandir}/man1/gdal2tiles.1* +%{_mandir}/man1/gdal_calc.1* +%{_mandir}/man1/gdalcompare.1* +%{_mandir}/man1/gdal_edit.1* +%{_mandir}/man1/gdal_fillnodata.1* +%{_mandir}/man1/gdal_merge.1* +%{_mandir}/man1/gdalmove.1* +%{_mandir}/man1/gdal_pansharpen.1* +%{_mandir}/man1/gdal_polygonize.1* +%{_mandir}/man1/gdal_proximity.1* +%{_mandir}/man1/gdal_retile.1* +%{_mandir}/man1/gdal_sieve.1* +%{_mandir}/man1/ogr_layer_algebra.1* +%{_mandir}/man1/ogrmerge.1* +%{_mandir}/man1/pct2rgb.1* +%{_mandir}/man1/rgb2pct.1* +%endif + %if %{with mingw} %files -n mingw32-%{name} %license LICENSE.TXT @@ -566,6 +661,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -n mingw32-%{name}-tools %{mingw32_bindir}/*.exe + +%if %{with python3} +%files -n mingw32-python3-%{name} %{mingw32_bindir}/gdal2tiles %{mingw32_bindir}/gdal2xyz %{mingw32_bindir}/gdal_calc @@ -584,6 +682,10 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{mingw32_bindir}/ogrmerge %{mingw32_bindir}/pct2rgb %{mingw32_bindir}/rgb2pct +%{mingw32_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ +%{mingw32_python3_sitearch}/osgeo/ +%{mingw32_python3_sitearch}/osgeo_utils/ +%endif %files -n mingw64-%{name} %license LICENSE.TXT @@ -597,6 +699,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -n mingw64-%{name}-tools %{mingw64_bindir}/*.exe + +%if %{with python3} +%files -n mingw64-python3-%{name} %{mingw64_bindir}/gdal2tiles %{mingw64_bindir}/gdal2xyz %{mingw64_bindir}/gdal_calc @@ -615,64 +720,12 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{mingw64_bindir}/ogrmerge %{mingw64_bindir}/pct2rgb %{mingw64_bindir}/rgb2pct -%endif - -%if 0%{?fedora} -%if %{with python3} -%files -n python3-gdal -%doc swig/python/README.rst -%{python3_sitearch}/GDAL-%{version}-py*.egg-info/ -%{python3_sitearch}/osgeo/ -%{python3_sitearch}/osgeo_utils/ - -%files python-tools -f gdal_python_manpages.txt -%{_bindir}/gdal_calc.py -%{_bindir}/gdal_edit.py -%{_bindir}/gdal_fillnodata.py -%{_bindir}/gdal_merge.py -%{_bindir}/gdal_pansharpen.py -%{_bindir}/gdal_polygonize.py -%{_bindir}/gdal_proximity.py -%{_bindir}/gdal_retile.py -%{_bindir}/gdal_sieve.py -%{_bindir}/gdal2tiles.py -%{_bindir}/gdal2xyz.py -%{_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/ -%{mingw32_python3_sitearch}/osgeo/ -%{mingw32_python3_sitearch}/osgeo_utils/ - -%files -n mingw64-python3-%{name} -%{mingw64_bindir}/*.py %{mingw64_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ %{mingw64_python3_sitearch}/osgeo/ %{mingw64_python3_sitearch}/osgeo_utils/ %endif %endif -%if %{with java} -%files java -%{_jnidir}/%{name}/gdal-%{version}-sources.jar -%{_jnidir}/%{name}/gdal-%{version}.jar -%{_jnidir}/%{name}/gdal-%{version}.pom -%{_jnidir}/%{name}/libgdalalljni.so - -%files javadoc -%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar -%endif -%endif - %changelog * Mon Apr 07 2025 Sandro Mani - 3.10.3-1 From 7e827502512658c0eb94d5a7c5b851af3a5e7e49 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 18 May 2025 21:39:52 +0200 Subject: [PATCH 16/49] Fix *.py scripts packaging --- gdal.spec | 129 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 39 deletions(-) diff --git a/gdal.spec b/gdal.spec index b653876..3d36c11 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.10.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -438,18 +438,9 @@ cp -a %{SOURCE4} . %install %cmake_install -# FIXME These should not be installed, the counterparts without the *.py suffix are the wanted ones -rm -f %{buildroot}%{_bindir}/*.py -# FIXME Fix bash-completion filenames -for file in %{buildroot}%{_datadir}/bash-completion/completions/*.py; do - mv $file ${file/.py/} -done %if %{with mingw} %mingw_make_install -# FIXME These should not be installed, the counterparts without the *.py suffix are the wanted ones -rm -f %{buildroot}%{mingw32_bindir}/*.py -rm -f %{buildroot}%{mingw64_bindir}/*.py # Delete data from cross packages rm -r %{buildroot}%{mingw32_datadir} rm -r %{buildroot}%{mingw64_datadir} @@ -463,6 +454,9 @@ 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 +# FIXME Fix shebangs +find %{buildroot} -name '*.py' -exec sed -i 's|^#!python$|#!/usr/bin/python3|g' {} \; + %if %{with mingw} %mingw_debug_install_post @@ -476,25 +470,25 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -%{_bindir}/gdaladdo -%{_bindir}/gdalbuildvrt %{_bindir}/gdal_contour %{_bindir}/gdal_create -%{_bindir}/gdaldem -%{_bindir}/gdalenhance %{_bindir}/gdal_footprint %{_bindir}/gdal_grid +%{_bindir}/gdal_rasterize +%{_bindir}/gdal_translate +%{_bindir}/gdal_viewshed +%{_bindir}/gdaladdo +%{_bindir}/gdalbuildvrt +%{_bindir}/gdaldem +%{_bindir}/gdalenhance %{_bindir}/gdalinfo %{_bindir}/gdallocationinfo %{_bindir}/gdalmanage %{_bindir}/gdalmdiminfo %{_bindir}/gdalmdimtranslate -%{_bindir}/gdal_rasterize %{_bindir}/gdalsrsinfo %{_bindir}/gdaltindex %{_bindir}/gdaltransform -%{_bindir}/gdal_translate -%{_bindir}/gdal_viewshed %{_bindir}/gdalwarp %{_bindir}/gnmanalyse %{_bindir}/gnmmanage @@ -508,23 +502,23 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/8211* %{_bindir}/s57dump %endif -%{_datadir}/bash-completion/completions/gdaladdo -%{_datadir}/bash-completion/completions/gdalbuildvrt %{_datadir}/bash-completion/completions/gdal-config %{_datadir}/bash-completion/completions/gdal_contour %{_datadir}/bash-completion/completions/gdal_create +%{_datadir}/bash-completion/completions/gdal_grid +%{_datadir}/bash-completion/completions/gdal_rasterize +%{_datadir}/bash-completion/completions/gdal_translate +%{_datadir}/bash-completion/completions/gdal_viewshed +%{_datadir}/bash-completion/completions/gdaladdo +%{_datadir}/bash-completion/completions/gdalbuildvrt %{_datadir}/bash-completion/completions/gdaldem %{_datadir}/bash-completion/completions/gdalenhance -%{_datadir}/bash-completion/completions/gdal_grid %{_datadir}/bash-completion/completions/gdalinfo %{_datadir}/bash-completion/completions/gdallocationinfo %{_datadir}/bash-completion/completions/gdalmanage -%{_datadir}/bash-completion/completions/gdal_rasterize %{_datadir}/bash-completion/completions/gdalsrsinfo %{_datadir}/bash-completion/completions/gdaltindex %{_datadir}/bash-completion/completions/gdaltransform -%{_datadir}/bash-completion/completions/gdal_translate -%{_datadir}/bash-completion/completions/gdal_viewshed %{_datadir}/bash-completion/completions/gdalwarp %{_datadir}/bash-completion/completions/ogr2ogr %{_datadir}/bash-completion/completions/ogrinfo @@ -597,39 +591,57 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files python-tools %{_bindir}/gdal2tiles +%{_bindir}/gdal2tiles.py %{_bindir}/gdal2xyz +%{_bindir}/gdal2xyz.py %{_bindir}/gdalattachpct +%{_bindir}/gdalattachpct.py %{_bindir}/gdal_calc +%{_bindir}/gdal_calc.py %{_bindir}/gdalcompare +%{_bindir}/gdalcompare.py %{_bindir}/gdal_edit +%{_bindir}/gdal_edit.py %{_bindir}/gdal_fillnodata +%{_bindir}/gdal_fillnodata.py %{_bindir}/gdal_merge +%{_bindir}/gdal_merge.py %{_bindir}/gdalmove +%{_bindir}/gdalmove.py %{_bindir}/gdal_pansharpen +%{_bindir}/gdal_pansharpen.py %{_bindir}/gdal_polygonize +%{_bindir}/gdal_polygonize.py %{_bindir}/gdal_proximity +%{_bindir}/gdal_proximity.py %{_bindir}/gdal_retile +%{_bindir}/gdal_retile.py %{_bindir}/gdal_sieve +%{_bindir}/gdal_sieve.py %{_bindir}/ogr_layer_algebra +%{_bindir}/ogr_layer_algebra.py %{_bindir}/ogrmerge +%{_bindir}/ogrmerge.py %{_bindir}/pct2rgb +%{_bindir}/pct2rgb.py %{_bindir}/rgb2pct -%{_datadir}/bash-completion/completions/gdal2tiles -%{_datadir}/bash-completion/completions/gdal2xyz -%{_datadir}/bash-completion/completions/gdal_calc -%{_datadir}/bash-completion/completions/gdalchksum -%{_datadir}/bash-completion/completions/gdalcompare -%{_datadir}/bash-completion/completions/gdal_edit -%{_datadir}/bash-completion/completions/gdal_fillnodata -%{_datadir}/bash-completion/completions/gdalident -%{_datadir}/bash-completion/completions/gdalimport -%{_datadir}/bash-completion/completions/gdal_merge -%{_datadir}/bash-completion/completions/gdalmove -%{_datadir}/bash-completion/completions/gdal_polygonize -%{_datadir}/bash-completion/completions/gdal_proximity -%{_datadir}/bash-completion/completions/gdal_retile -%{_datadir}/bash-completion/completions/gdal_sieve -%{_datadir}/bash-completion/completions/ogrmerge +%{_bindir}/rgb2pct.py +%{_datadir}/bash-completion/completions/gdal2tiles.py +%{_datadir}/bash-completion/completions/gdal2xyz.py +%{_datadir}/bash-completion/completions/gdal_calc.py +%{_datadir}/bash-completion/completions/gdal_edit.py +%{_datadir}/bash-completion/completions/gdal_fillnodata.py +%{_datadir}/bash-completion/completions/gdal_merge.py +%{_datadir}/bash-completion/completions/gdal_polygonize.py +%{_datadir}/bash-completion/completions/gdal_proximity.py +%{_datadir}/bash-completion/completions/gdal_retile.py +%{_datadir}/bash-completion/completions/gdal_sieve.py +%{_datadir}/bash-completion/completions/gdalchksum.py +%{_datadir}/bash-completion/completions/gdalcompare.py +%{_datadir}/bash-completion/completions/gdalident.py +%{_datadir}/bash-completion/completions/gdalimport.py +%{_datadir}/bash-completion/completions/gdalmove.py +%{_datadir}/bash-completion/completions/ogrmerge.py %{_mandir}/man1/gdal2tiles.1* %{_mandir}/man1/gdal_calc.1* %{_mandir}/man1/gdalcompare.1* @@ -665,23 +677,41 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %if %{with python3} %files -n mingw32-python3-%{name} %{mingw32_bindir}/gdal2tiles +%{mingw32_bindir}/gdal2tiles.py %{mingw32_bindir}/gdal2xyz +%{mingw32_bindir}/gdal2xyz.py %{mingw32_bindir}/gdal_calc +%{mingw32_bindir}/gdal_calc.py %{mingw32_bindir}/gdal_edit +%{mingw32_bindir}/gdal_edit.py %{mingw32_bindir}/gdal_fillnodata +%{mingw32_bindir}/gdal_fillnodata.py %{mingw32_bindir}/gdal_merge +%{mingw32_bindir}/gdal_merge.py %{mingw32_bindir}/gdal_pansharpen +%{mingw32_bindir}/gdal_pansharpen.py %{mingw32_bindir}/gdal_polygonize +%{mingw32_bindir}/gdal_polygonize.py %{mingw32_bindir}/gdal_proximity +%{mingw32_bindir}/gdal_proximity.py %{mingw32_bindir}/gdal_retile +%{mingw32_bindir}/gdal_retile.py %{mingw32_bindir}/gdal_sieve +%{mingw32_bindir}/gdal_sieve.py %{mingw32_bindir}/gdalattachpct +%{mingw32_bindir}/gdalattachpct.py %{mingw32_bindir}/gdalcompare +%{mingw32_bindir}/gdalcompare.py %{mingw32_bindir}/gdalmove +%{mingw32_bindir}/gdalmove.py %{mingw32_bindir}/ogr_layer_algebra +%{mingw32_bindir}/ogr_layer_algebra.py %{mingw32_bindir}/ogrmerge +%{mingw32_bindir}/ogrmerge.py %{mingw32_bindir}/pct2rgb +%{mingw32_bindir}/pct2rgb.py %{mingw32_bindir}/rgb2pct +%{mingw32_bindir}/rgb2pct.py %{mingw32_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ %{mingw32_python3_sitearch}/osgeo/ %{mingw32_python3_sitearch}/osgeo_utils/ @@ -703,23 +733,41 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %if %{with python3} %files -n mingw64-python3-%{name} %{mingw64_bindir}/gdal2tiles +%{mingw64_bindir}/gdal2tiles.py %{mingw64_bindir}/gdal2xyz +%{mingw64_bindir}/gdal2xyz.py %{mingw64_bindir}/gdal_calc +%{mingw64_bindir}/gdal_calc.py %{mingw64_bindir}/gdal_edit +%{mingw64_bindir}/gdal_edit.py %{mingw64_bindir}/gdal_fillnodata +%{mingw64_bindir}/gdal_fillnodata.py %{mingw64_bindir}/gdal_merge +%{mingw64_bindir}/gdal_merge.py %{mingw64_bindir}/gdal_pansharpen +%{mingw64_bindir}/gdal_pansharpen.py %{mingw64_bindir}/gdal_polygonize +%{mingw64_bindir}/gdal_polygonize.py %{mingw64_bindir}/gdal_proximity +%{mingw64_bindir}/gdal_proximity.py %{mingw64_bindir}/gdal_retile +%{mingw64_bindir}/gdal_retile.py %{mingw64_bindir}/gdal_sieve +%{mingw64_bindir}/gdal_sieve.py %{mingw64_bindir}/gdalattachpct +%{mingw64_bindir}/gdalattachpct.py %{mingw64_bindir}/gdalcompare +%{mingw64_bindir}/gdalcompare.py %{mingw64_bindir}/gdalmove +%{mingw64_bindir}/gdalmove.py %{mingw64_bindir}/ogr_layer_algebra +%{mingw64_bindir}/ogr_layer_algebra.py %{mingw64_bindir}/ogrmerge +%{mingw64_bindir}/ogrmerge.py %{mingw64_bindir}/pct2rgb +%{mingw64_bindir}/pct2rgb.py %{mingw64_bindir}/rgb2pct +%{mingw64_bindir}/rgb2pct.py %{mingw64_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ %{mingw64_python3_sitearch}/osgeo/ %{mingw64_python3_sitearch}/osgeo_utils/ @@ -728,6 +776,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Fri May 16 2025 Sandro Mani - 3.10.3-2 +- Fix *.py scripts packaging + * Mon Apr 07 2025 Sandro Mani - 3.10.3-1 - Update to 3.10.3 From 1a3603cd221c141d9f0122ce22963990fc95a035 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 22 May 2025 18:26:07 -0400 Subject: [PATCH 17/49] Remove completions and manpages for unpackaged scripts When building for RHEL, the python bindings and scripts are now disabled, but the completions and manpages are not controlled by the option which disables the scripts. --- gdal.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 3d36c11..0245a8a 100644 --- a/gdal.spec +++ b/gdal.spec @@ -457,6 +457,15 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config # FIXME Fix shebangs find %{buildroot} -name '*.py' -exec sed -i 's|^#!python$|#!/usr/bin/python3|g' {} \; +%if %{without python3} +# completions and manpages for python scripts regardless of BUILD_PYTHON_BINDINGS +for p in gdal2tiles gdal2xyz gdal_calc gdal_edit gdal_fillnodata gdal_merge gdal_pansharpen \ + gdal_polygonize gdal_proximity gdal_retile gdal_sieve gdalchksum gdalcompare \ + gdalident gdalimport gdalmove ogr_layer_algebra ogrmerge pct2rgb rgb2pct ; do + rm -f %{buildroot}%{_datadir}/bash-completion/completions/${p}.py + rm -f %{buildroot}%{_mandir}/man1/${p}.1* +done +%endif %if %{with mingw} %mingw_debug_install_post @@ -550,7 +559,6 @@ find %{buildroot} -name '*.py' -exec sed -i 's|^#!python$|#!/usr/bin/python3|g' %{_mandir}/man1/ogr2ogr.1.* %{_mandir}/man1/ogrinfo.1.* %{_mandir}/man1/ogrlineref.1.* -%{_mandir}/man1/ogrmerge.1.* %{_mandir}/man1/ogrtindex.1.* %{_mandir}/man1/sozip.1.* From 424b52eaac56b608ae8a16d69908e3104cbd0387 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 4 Jun 2025 00:50:30 +0200 Subject: [PATCH 18/49] Rebuilt for Python 3.14 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 0245a8a..7ea847c 100644 --- 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 @@ -784,6 +784,9 @@ done %changelog +* Tue Jun 03 2025 Python Maint - 3.10.3-3 +- Rebuilt for Python 3.14 + * Fri May 16 2025 Sandro Mani - 3.10.3-2 - Fix *.py scripts packaging From 8df52d19a34abc9106f700a1789aab8c03d3de00 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 10 Jul 2025 19:20:36 -0400 Subject: [PATCH 19/49] Rebuilt for libarrow 20 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 7ea847c..b6d185d 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.10.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -784,6 +784,9 @@ done %changelog +* Thu Jul 10 2025 Stephen Gallagher - 3.10.3-4 +- Rebuilt for libarrow 20 + * Tue Jun 03 2025 Python Maint - 3.10.3-3 - Rebuilt for Python 3.14 From e70fc9f76d430e6c3ce22a74d4982e40bb0d2696 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Jul 2025 17:21:27 +0200 Subject: [PATCH 20/49] Rebuild (poppler) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index b6d185d..0f47ca5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.10.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -784,6 +784,9 @@ done %changelog +* Fri Jul 18 2025 Sandro Mani - 3.10.3-5 +- Rebuild (poppler) + * Thu Jul 10 2025 Stephen Gallagher - 3.10.3-4 - Rebuilt for libarrow 20 From 1eca685c25f55823beaa6ba41962b0920a1404b4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Jul 2025 18:49:26 +0200 Subject: [PATCH 21/49] Backport patch to fix build against poppler 2025.05.0 --- ...e2189ff0a464f3150ed8b2dd5a3cc1194012.patch | 49 +++++++++++++++++++ gdal-3.10.2-integer-types.patch | 2 +- gdal.spec | 2 + gdal_incompatible-pointer-types.patch | 2 +- gdal_utils.patch | 4 +- 5 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch diff --git a/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch b/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch new file mode 100644 index 0000000..0b51fcd --- /dev/null +++ b/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch @@ -0,0 +1,49 @@ +diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/pdf/pdfio.cpp gdal-3.10.3-fedora-new/frmts/pdf/pdfio.cpp +--- gdal-3.10.3-fedora/frmts/pdf/pdfio.cpp 2025-04-01 13:03:21.000000000 +0200 ++++ gdal-3.10.3-fedora-new/frmts/pdf/pdfio.cpp 2025-07-18 18:48:46.145599620 +0200 +@@ -77,12 +77,25 @@ BaseStream *VSIPDFFileStream::copy() + /************************************************************************/ + /* makeSubStream() */ + /************************************************************************/ ++ ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 5) ++std::unique_ptr VSIPDFFileStream::makeSubStream(Goffset startA, ++ bool limitedA, ++ Goffset lengthA, ++ Object &&dictA) ++{ ++ return std::make_unique(this, startA, limitedA, lengthA, ++ std::move(dictA)); ++} ++#else + Stream *VSIPDFFileStream::makeSubStream(Goffset startA, bool limitedA, + Goffset lengthA, Object &&dictA) + { + return new VSIPDFFileStream(this, startA, limitedA, lengthA, + std::move(dictA)); + } ++#endif + + /************************************************************************/ + /* getPos() */ +diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/pdf/pdfio.h gdal-3.10.3-fedora-new/frmts/pdf/pdfio.h +--- gdal-3.10.3-fedora/frmts/pdf/pdfio.h 2025-04-01 13:03:22.000000000 +0200 ++++ gdal-3.10.3-fedora-new/frmts/pdf/pdfio.h 2025-07-18 18:48:46.145779709 +0200 +@@ -32,8 +32,16 @@ class VSIPDFFileStream final : public Ba + + virtual BaseStream *copy() override; + ++#if POPPLER_MAJOR_VERSION > 25 || \ ++ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 5) ++ virtual std::unique_ptr makeSubStream(Goffset startA, bool limitedA, ++ Goffset lengthA, ++ Object &&dictA) override; ++#else + virtual Stream *makeSubStream(Goffset startA, bool limitedA, + Goffset lengthA, Object &&dictA) override; ++ ++#endif + virtual Goffset getPos() override; + virtual Goffset getStart() override; + diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch index dfad44c..aaeca5d 100644 --- a/gdal-3.10.2-integer-types.patch +++ b/gdal-3.10.2-integer-types.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp --- gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-01 13:03:21.000000000 +0200 -+++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-07 13:39:47.674069257 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-07-18 18:48:45.937456577 +0200 @@ -23,6 +23,7 @@ #include #include diff --git a/gdal.spec b/gdal.spec index 0f47ca5..9284c9a 100644 --- a/gdal.spec +++ b/gdal.spec @@ -71,6 +71,8 @@ Patch0: gdal_utils.patch Patch1: gdal_incompatible-pointer-types.patch # Add definitions of missing int16_t and int32_t Patch2: gdal-3.10.2-integer-types.patch +# Fix build against poppler 2025.05.0+ +Patch3: https://github.com/OSGeo/gdal/commit/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch BuildRequires: cmake BuildRequires: gcc-c++ diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch index f70e12e..f33adc6 100644 --- a/gdal_incompatible-pointer-types.patch +++ b/gdal_incompatible-pointer-types.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp --- gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp 2025-04-01 13:03:22.000000000 +0200 -+++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-04-07 13:39:47.318116680 +0200 ++++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-07-18 18:48:45.724376806 +0200 @@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons pwszFilename[nLen - 1] = 0; #endif diff --git a/gdal_utils.patch b/gdal_utils.patch index 3128eba..099a954 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt --- gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt 2025-04-01 13:03:21.000000000 +0200 -+++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-04-07 13:39:46.951980413 +0200 ++++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-18 18:48:45.507762803 +0200 @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -24,7 +24,7 @@ diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt --- gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-01 13:03:22.000000000 +0200 -+++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-07 13:39:46.952461833 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-18 18:48:45.508029107 +0200 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") From 20fd14c6becdd63b4fbd75ecf721bdffc6b3dd1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 21:10:49 +0000 Subject: [PATCH 22/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 9284c9a..94fc370 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.10.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -786,6 +786,9 @@ done %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.10.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 18 2025 Sandro Mani - 3.10.3-5 - Rebuild (poppler) From 1bfaf552742f0188b54762342827b42943fff905 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 27 Jul 2025 19:08:42 +0200 Subject: [PATCH 23/49] Update to 3.11.3 --- .gitignore | 2 + ...e2189ff0a464f3150ed8b2dd5a3cc1194012.patch | 49 ------ gdal-3.10.2-integer-types.patch | 11 -- gdal-cleaner.sh | 18 +- gdal.spec | 156 ++++++++++++------ gdal_incompatible-pointer-types.patch | 21 --- gdal_utils.patch | 15 ++ sources | 4 +- 8 files changed, 138 insertions(+), 138 deletions(-) delete mode 100644 a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch delete mode 100644 gdal-3.10.2-integer-types.patch delete mode 100644 gdal_incompatible-pointer-types.patch diff --git a/.gitignore b/.gitignore index 31914c4..cba36dd 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.10.2.tar.gz /gdal-3.10.3-fedora.tar.xz /gdalautotest-3.10.3.tar.gz +/gdal-3.11.3-fedora.tar.xz +/gdalautotest-3.11.3.tar.gz diff --git a/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch b/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch deleted file mode 100644 index 0b51fcd..0000000 --- a/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/pdf/pdfio.cpp gdal-3.10.3-fedora-new/frmts/pdf/pdfio.cpp ---- gdal-3.10.3-fedora/frmts/pdf/pdfio.cpp 2025-04-01 13:03:21.000000000 +0200 -+++ gdal-3.10.3-fedora-new/frmts/pdf/pdfio.cpp 2025-07-18 18:48:46.145599620 +0200 -@@ -77,12 +77,25 @@ BaseStream *VSIPDFFileStream::copy() - /************************************************************************/ - /* makeSubStream() */ - /************************************************************************/ -+ -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 5) -+std::unique_ptr VSIPDFFileStream::makeSubStream(Goffset startA, -+ bool limitedA, -+ Goffset lengthA, -+ Object &&dictA) -+{ -+ return std::make_unique(this, startA, limitedA, lengthA, -+ std::move(dictA)); -+} -+#else - Stream *VSIPDFFileStream::makeSubStream(Goffset startA, bool limitedA, - Goffset lengthA, Object &&dictA) - { - return new VSIPDFFileStream(this, startA, limitedA, lengthA, - std::move(dictA)); - } -+#endif - - /************************************************************************/ - /* getPos() */ -diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/pdf/pdfio.h gdal-3.10.3-fedora-new/frmts/pdf/pdfio.h ---- gdal-3.10.3-fedora/frmts/pdf/pdfio.h 2025-04-01 13:03:22.000000000 +0200 -+++ gdal-3.10.3-fedora-new/frmts/pdf/pdfio.h 2025-07-18 18:48:46.145779709 +0200 -@@ -32,8 +32,16 @@ class VSIPDFFileStream final : public Ba - - virtual BaseStream *copy() override; - -+#if POPPLER_MAJOR_VERSION > 25 || \ -+ (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 5) -+ virtual std::unique_ptr makeSubStream(Goffset startA, bool limitedA, -+ Goffset lengthA, -+ Object &&dictA) override; -+#else - virtual Stream *makeSubStream(Goffset startA, bool limitedA, - Goffset lengthA, Object &&dictA) override; -+ -+#endif - virtual Goffset getPos() override; - virtual Goffset getStart() override; - diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch deleted file mode 100644 index aaeca5d..0000000 --- a/gdal-3.10.2-integer-types.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp ---- gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-01 13:03:21.000000000 +0200 -+++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-07-18 18:48:45.937456577 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) - // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index db17622..b7f4a8c 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ $# -lt 1 ]; then - echo "Usage: $0 version" + echo "Usage: $0 version pre" exit 1 fi @@ -18,20 +18,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 94fc370..52a02f3 100644 --- a/gdal.spec +++ b/gdal.spec @@ -42,12 +42,12 @@ %bcond_with java %endif -#global pre rc1 +#global pre beta1 Name: gdal -Version: 3.10.3 -Release: 6%{?dist} +Version: 3.11.3 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -67,12 +67,6 @@ 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 -# Add definitions of missing int16_t and int32_t -Patch2: gdal-3.10.2-integer-types.patch -# Fix build against poppler 2025.05.0+ -Patch3: https://github.com/OSGeo/gdal/commit/a689e2189ff0a464f3150ed8b2dd5a3cc1194012.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -175,6 +169,7 @@ BuildRequires: mingw32-expat BuildRequires: mingw32-freexl BuildRequires: mingw32-geos BuildRequires: mingw32-giflib +BuildRequires: mingw32-json-c BuildRequires: mingw32-libarchive BuildRequires: mingw32-libgeotiff BuildRequires: mingw32-libgta @@ -211,6 +206,7 @@ BuildRequires: mingw64-expat BuildRequires: mingw64-freexl BuildRequires: mingw64-geos BuildRequires: mingw64-giflib +BuildRequires: mingw64-json-c BuildRequires: mingw64-libarchive BuildRequires: mingw64-libgeotiff BuildRequires: mingw64-libgta @@ -380,22 +376,23 @@ MinGW Windows Python3 GDAL bindings. %endif %prep -%autosetup -N -p1 -n %{name}-%{version}-fedora +%autosetup -N -p1 -n %{name}-%{version}%{?pre:%pre}-fedora # Delete bundled libraries -rm -rf frmts/zlib +# rm -rf frmts/zlib rm -rf frmts/png/libpng rm -rf frmts/gif/giflib rm -rf frmts/jpeg/libjpeg rm -rf frmts/jpeg/libjpeg12 rm -rf frmts/gtiff/libgeotiff -rm -rf frmts/gtiff/libtiff +# FIXME: frmts/libertiff/libtiff_codecs.h requires tif_lzw.c, tif_packbits.c, tif_lerc.c +# rm -rf frmts/gtiff/libtiff rm -rf mrf/LERCV1 rm -rf third_party/LercLib # Setup autotest directory tar xf %{SOURCE1} -mv %{name}autotest-%{version} autotest +mv %{name}autotest-%{version}%{?pre:%pre} autotest # Need to patch autotest %autopatch -p1 @@ -407,6 +404,8 @@ cp -a %{SOURCE4} . %build %cmake \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ + -DGDAL_USE_EXTERNAL_LIB=ON \ + -DGDAL_USE_INTERNAL_LIBS=OFF \ %if %{with java} -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ @@ -414,26 +413,17 @@ cp -a %{SOURCE4} . %if ! 0%{?fedora} -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \ - -DGDAL_USE_JPEG=ON \ - -DGDAL_USE_JPEG_INTERNAL=OFF \ - -DGDAL_USE_GOOGLETEST=OFF \ - -DGDAL_USE_LERC=OFF \ - -DGDAL_USE_LERC_INTERNAL=OFF \ - -DGDAL_USE_GEOTIFF=OFF \ - -DGDAL_USE_GEOTIFF_INTERNAL=OFF \ -DBUILD_PYTHON_BINDINGS=OFF \ - -DBUILD_TESTING=OFF \ + -DBUILD_TESTING=OFF %endif - -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 \ - -DENABLE_DEFLATE64=OFF + -DGDAL_USE_EXTERNAL_LIB=ON \ + -DGDAL_USE_INTERNAL_LIBS=OFF %mingw_make_build %endif @@ -481,6 +471,9 @@ done %files +%{_bindir}/gdal +%{_bindir}/gdaladdo +%{_bindir}/gdalbuildvrt %{_bindir}/gdal_contour %{_bindir}/gdal_create %{_bindir}/gdal_footprint @@ -567,8 +560,8 @@ done %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora -%{_libdir}/libgdal.so.36 -%{_libdir}/libgdal.so.36.* +%{_libdir}/libgdal.so.37 +%{_libdir}/libgdal.so.37.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -635,23 +628,23 @@ done %{_bindir}/pct2rgb %{_bindir}/pct2rgb.py %{_bindir}/rgb2pct -%{_bindir}/rgb2pct.py -%{_datadir}/bash-completion/completions/gdal2tiles.py -%{_datadir}/bash-completion/completions/gdal2xyz.py -%{_datadir}/bash-completion/completions/gdal_calc.py -%{_datadir}/bash-completion/completions/gdal_edit.py -%{_datadir}/bash-completion/completions/gdal_fillnodata.py -%{_datadir}/bash-completion/completions/gdal_merge.py -%{_datadir}/bash-completion/completions/gdal_polygonize.py -%{_datadir}/bash-completion/completions/gdal_proximity.py -%{_datadir}/bash-completion/completions/gdal_retile.py -%{_datadir}/bash-completion/completions/gdal_sieve.py -%{_datadir}/bash-completion/completions/gdalchksum.py -%{_datadir}/bash-completion/completions/gdalcompare.py -%{_datadir}/bash-completion/completions/gdalident.py -%{_datadir}/bash-completion/completions/gdalimport.py -%{_datadir}/bash-completion/completions/gdalmove.py -%{_datadir}/bash-completion/completions/ogrmerge.py +%{_datadir}/bash-completion/completions/gdal +%{_datadir}/bash-completion/completions/gdal2tiles +%{_datadir}/bash-completion/completions/gdal2xyz +%{_datadir}/bash-completion/completions/gdal_calc +%{_datadir}/bash-completion/completions/gdalchksum +%{_datadir}/bash-completion/completions/gdalcompare +%{_datadir}/bash-completion/completions/gdal_edit +%{_datadir}/bash-completion/completions/gdal_fillnodata +%{_datadir}/bash-completion/completions/gdalident +%{_datadir}/bash-completion/completions/gdalimport +%{_datadir}/bash-completion/completions/gdal_merge +%{_datadir}/bash-completion/completions/gdalmove +%{_datadir}/bash-completion/completions/gdal_polygonize +%{_datadir}/bash-completion/completions/gdal_proximity +%{_datadir}/bash-completion/completions/gdal_retile +%{_datadir}/bash-completion/completions/gdal_sieve +%{_datadir}/bash-completion/completions/ogrmerge %{_mandir}/man1/gdal2tiles.1* %{_mandir}/man1/gdal_calc.1* %{_mandir}/man1/gdalcompare.1* @@ -668,12 +661,80 @@ done %{_mandir}/man1/ogrmerge.1* %{_mandir}/man1/pct2rgb.1* %{_mandir}/man1/rgb2pct.1* +%{_mandir}/man1/gdal-convert.1* +%{_mandir}/man1/gdal-info.1* +%{_mandir}/man1/gdal-mdim-convert.1* +%{_mandir}/man1/gdal-mdim-info.1* +%{_mandir}/man1/gdal-mdim.1* +%{_mandir}/man1/gdal-raster-calc.1* +%{_mandir}/man1/gdal-raster-clean-collar.1* +%{_mandir}/man1/gdal-raster-clip.1* +%{_mandir}/man1/gdal-raster-color-map.1* +%{_mandir}/man1/gdal-raster-contour.1* +%{_mandir}/man1/gdal-raster-convert.1* +%{_mandir}/man1/gdal-raster-create.1* +%{_mandir}/man1/gdal-raster-edit.1* +%{_mandir}/man1/gdal-raster-fill-nodata.1* +%{_mandir}/man1/gdal-raster-footprint.1* +%{_mandir}/man1/gdal-raster-hillshade.1* +%{_mandir}/man1/gdal-raster-index.1* +%{_mandir}/man1/gdal-raster-info.1* +%{_mandir}/man1/gdal-raster-mosaic.1* +%{_mandir}/man1/gdal-raster-overview-add.1* +%{_mandir}/man1/gdal-raster-overview-delete.1* +%{_mandir}/man1/gdal-raster-pipeline.1* +%{_mandir}/man1/gdal-raster-pixel-info.1* +%{_mandir}/man1/gdal-raster-polygonize.1* +%{_mandir}/man1/gdal-raster-reclassify.1* +%{_mandir}/man1/gdal-raster-reproject.1* +%{_mandir}/man1/gdal-raster-resize.1* +%{_mandir}/man1/gdal-raster-roughness.1* +%{_mandir}/man1/gdal-raster-scale.1* +%{_mandir}/man1/gdal-raster-select.1* +%{_mandir}/man1/gdal-raster-set-type.1* +%{_mandir}/man1/gdal-raster-sieve.1* +%{_mandir}/man1/gdal-raster-slope.1* +%{_mandir}/man1/gdal-raster-stack.1* +%{_mandir}/man1/gdal-raster-tile.1* +%{_mandir}/man1/gdal-raster-tpi.1* +%{_mandir}/man1/gdal-raster-tri.1* +%{_mandir}/man1/gdal-raster-unscale.1* +%{_mandir}/man1/gdal-raster-viewshed.1* +%{_mandir}/man1/gdal-raster.1* +%{_mandir}/man1/gdal-vector-clip.1* +%{_mandir}/man1/gdal-vector-convert.1* +%{_mandir}/man1/gdal-vector-edit.1* +%{_mandir}/man1/gdal-vector-filter.1* +%{_mandir}/man1/gdal-vector-geom-buffer.1* +%{_mandir}/man1/gdal-vector-geom-explode-collections.1* +%{_mandir}/man1/gdal-vector-geom-make-valid.1* +%{_mandir}/man1/gdal-vector-geom-segmentize.1* +%{_mandir}/man1/gdal-vector-geom-set-type.1* +%{_mandir}/man1/gdal-vector-geom-simplify.1* +%{_mandir}/man1/gdal-vector-geom-swap-xy.1* +%{_mandir}/man1/gdal-vector-geom.1* +%{_mandir}/man1/gdal-vector-grid.1* +%{_mandir}/man1/gdal-vector-info.1* +%{_mandir}/man1/gdal-vector-pipeline.1* +%{_mandir}/man1/gdal-vector-rasterize.1* +%{_mandir}/man1/gdal-vector-select.1* +%{_mandir}/man1/gdal-vector-sql.1* +%{_mandir}/man1/gdal-vector.1* +%{_mandir}/man1/gdal-vector_concat.1* +%{_mandir}/man1/gdal-vsi-copy.1* +%{_mandir}/man1/gdal-vsi-delete.1* +%{_mandir}/man1/gdal-vsi-list.1* +%{_mandir}/man1/gdal-vsi-move.1* +%{_mandir}/man1/gdal-vsi-sozip.1* +%{_mandir}/man1/gdal-vsi-sync.1* +%{_mandir}/man1/gdal-vsi.1* +%{_mandir}/man1/gdal.1* %endif %if %{with mingw} %files -n mingw32-%{name} %license LICENSE.TXT -%{mingw32_bindir}/libgdal-36.dll +%{mingw32_bindir}/libgdal-37.dll %{mingw32_bindir}/gdal-config %{mingw32_libdir}/libgdal.dll.a %{mingw32_libdir}/cmake/gdal/ @@ -729,7 +790,7 @@ done %files -n mingw64-%{name} %license LICENSE.TXT -%{mingw64_bindir}/libgdal-36.dll +%{mingw64_bindir}/libgdal-37.dll %{mingw64_bindir}/gdal-config %{mingw64_libdir}/libgdal.dll.a %{mingw64_libdir}/cmake/gdal/ @@ -786,6 +847,9 @@ done %changelog +* Sun Jul 27 2025 Sandro Mani - 3.11.3-1 +- Update to 3.11.3 + * Wed Jul 23 2025 Fedora Release Engineering - 3.10.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch deleted file mode 100644 index f33adc6..0000000 --- a/gdal_incompatible-pointer-types.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp ---- gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp 2025-04-01 13:03:22.000000000 +0200 -+++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-07-18 18:48:45.724376806 +0200 -@@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons - pwszFilename[nLen - 1] = 0; - #endif - -- int nResult = _wstat64(pwszFilename, pStatBuf); -+ int nResult = _wstat64(pwszFilename, reinterpret_cast(pStatBuf)); - - // If _wstat64() fails and the original name is not an extended one, - // then retry with an extended filename -@@ -907,7 +907,7 @@ int VSIWin32FilesystemHandler::Stat(cons - nLastError == ERROR_FILENAME_EXCED_RANGE) - { - VSIWin32TryLongFilename(pwszFilename); -- nResult = _wstat64(pwszFilename, pStatBuf); -+ nResult = _wstat64(pwszFilename, reinterpret_cast(pStatBuf)); - } - } - diff --git a/gdal_utils.patch b/gdal_utils.patch index 099a954..62a2f1c 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,12 @@ +<<<<<<< HEAD diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt --- gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt 2025-04-01 13:03:21.000000000 +0200 +++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-18 18:48:45.507762803 +0200 +======= +diff -rupN --no-dereference gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt 2025-07-12 12:33:49.000000000 +0200 ++++ gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-13 12:08:42.843328554 +0200 +>>>>>>> a8c258f (Update to 3.11.3) @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -22,12 +28,21 @@ diff -rupN --no-dereference gdal-3.10.3-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}) +<<<<<<< HEAD diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt --- gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-01 13:03:22.000000000 +0200 +++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-18 18:48:45.508029107 +0200 @@ -27,7 +27,8 @@ set_property( APPEND PROPERTY RESOURCE "${GDAL_DATA_FILES}") +======= +diff -rupN --no-dereference gdal-3.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-12 12:33:50.000000000 +0200 ++++ gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-13 12:08:42.843906384 +0200 +@@ -35,7 +35,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) + target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) + endif() +>>>>>>> a8c258f (Update to 3.11.3) -add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp) +add_executable(s57dump s57dump.cpp) diff --git a/sources b/sources index 0ddc2fd..dabdefb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.10.3-fedora.tar.xz) = 1dced4c7a62ce74323e26d859b4fe82b67f660ab65c2a44f8de35771b7d9dca73b2d1d8c0497588b686bd3b5ea05045caa9558e19618e4c2b2bea3bf03781483 -SHA512 (gdalautotest-3.10.3.tar.gz) = af8637944498adfbc33b26f747bab0ad6b46216c58a994248ad8e252c90c6050709bef1b0c15986edfb6a87ee7d09bac8fd837266b5deb8980409bb018037c60 +SHA512 (gdal-3.11.3-fedora.tar.xz) = 3ca3940387f414b98845cf3ac62988ba4a5fd0b18e2f95cbc9373012c70c8600327b119e176795dc6fd90f9066f4b201feadfa78f037c5599e0c14ad6cf4531b +SHA512 (gdalautotest-3.11.3.tar.gz) = b7a42317c02e0cd268c77bb77e2c8e2742d4611f228a1f8a7cd8c6f27c0d854249ec6410af2a9848cdc18b7080b29cd6ff15478ab78f2eb6b3ecd2183f3a0d69 From e95684c34eee419ff5fe857e18f306583eb9e090 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 27 Jul 2025 19:23:59 +0200 Subject: [PATCH 24/49] Fix malformed patch --- gdal_utils.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gdal_utils.patch b/gdal_utils.patch index 62a2f1c..26d7480 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,12 +1,6 @@ -<<<<<<< HEAD -diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt 2025-04-01 13:03:21.000000000 +0200 -+++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-18 18:48:45.507762803 +0200 -======= diff -rupN --no-dereference gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt --- gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt 2025-07-12 12:33:49.000000000 +0200 +++ gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-13 12:08:42.843328554 +0200 ->>>>>>> a8c258f (Update to 3.11.3) @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -28,21 +22,12 @@ diff -rupN --no-dereference gdal-3.11.3-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}) -<<<<<<< HEAD -diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-01 13:03:22.000000000 +0200 -+++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-18 18:48:45.508029107 +0200 -@@ -27,7 +27,8 @@ set_property( - APPEND - PROPERTY RESOURCE "${GDAL_DATA_FILES}") -======= diff -rupN --no-dereference gdal-3.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt --- gdal-3.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-12 12:33:50.000000000 +0200 +++ gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-13 12:08:42.843906384 +0200 @@ -35,7 +35,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) endif() ->>>>>>> a8c258f (Update to 3.11.3) -add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp) +add_executable(s57dump s57dump.cpp) From 698a044082f6ca1c7a0003a4c462c699b951b07a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 27 Jul 2025 20:53:16 +0200 Subject: [PATCH 25/49] Drop BR: ogdi-devel (#2345558) --- gdal.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 52a02f3..91551b8 100644 --- a/gdal.spec +++ b/gdal.spec @@ -122,7 +122,6 @@ BuildRequires: libzstd-devel BuildRequires: mariadb-connector-c-devel %endif BuildRequires: netcdf-devel -BuildRequires: ogdi-devel BuildRequires: openexr-devel BuildRequires: openssl-devel-engine %ifnarch %{ix86} %{arm} From c4cc55a1812a13fc8a33ff5b799660c13a89dc09 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Jul 2025 10:41:06 +0200 Subject: [PATCH 26/49] Fix %%files --- gdal.spec | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/gdal.spec b/gdal.spec index 91551b8..75bd02e 100644 --- a/gdal.spec +++ b/gdal.spec @@ -471,8 +471,6 @@ done %files %{_bindir}/gdal -%{_bindir}/gdaladdo -%{_bindir}/gdalbuildvrt %{_bindir}/gdal_contour %{_bindir}/gdal_create %{_bindir}/gdal_footprint @@ -505,7 +503,7 @@ done %{_bindir}/8211* %{_bindir}/s57dump %endif -%{_datadir}/bash-completion/completions/gdal-config +%{_datadir}/bash-completion/completions/gdal %{_datadir}/bash-completion/completions/gdal_contour %{_datadir}/bash-completion/completions/gdal_create %{_datadir}/bash-completion/completions/gdal_grid @@ -627,23 +625,23 @@ done %{_bindir}/pct2rgb %{_bindir}/pct2rgb.py %{_bindir}/rgb2pct -%{_datadir}/bash-completion/completions/gdal -%{_datadir}/bash-completion/completions/gdal2tiles -%{_datadir}/bash-completion/completions/gdal2xyz -%{_datadir}/bash-completion/completions/gdal_calc -%{_datadir}/bash-completion/completions/gdalchksum -%{_datadir}/bash-completion/completions/gdalcompare -%{_datadir}/bash-completion/completions/gdal_edit -%{_datadir}/bash-completion/completions/gdal_fillnodata -%{_datadir}/bash-completion/completions/gdalident -%{_datadir}/bash-completion/completions/gdalimport -%{_datadir}/bash-completion/completions/gdal_merge -%{_datadir}/bash-completion/completions/gdalmove -%{_datadir}/bash-completion/completions/gdal_polygonize -%{_datadir}/bash-completion/completions/gdal_proximity -%{_datadir}/bash-completion/completions/gdal_retile -%{_datadir}/bash-completion/completions/gdal_sieve -%{_datadir}/bash-completion/completions/ogrmerge +%{_datadir}/bash-completion/completions/gdal2tiles.py +%{_datadir}/bash-completion/completions/gdal2xyz.py +%{_datadir}/bash-completion/completions/gdalchksum.py +%{_datadir}/bash-completion/completions/gdalcompare.py +%{_datadir}/bash-completion/completions/gdalident.py +%{_datadir}/bash-completion/completions/gdalimport.py +%{_datadir}/bash-completion/completions/gdalmove.py +%{_datadir}/bash-completion/completions/gdal_calc.py +%{_datadir}/bash-completion/completions/gdal-config +%{_datadir}/bash-completion/completions/gdal_edit.py +%{_datadir}/bash-completion/completions/gdal_fillnodata.py +%{_datadir}/bash-completion/completions/gdal_merge.py +%{_datadir}/bash-completion/completions/gdal_polygonize.py +%{_datadir}/bash-completion/completions/gdal_proximity.py +%{_datadir}/bash-completion/completions/gdal_retile.py +%{_datadir}/bash-completion/completions/gdal_sieve.py +%{_datadir}/bash-completion/completions/ogrmerge.py %{_mandir}/man1/gdal2tiles.1* %{_mandir}/man1/gdal_calc.1* %{_mandir}/man1/gdalcompare.1* From 196ae48f0524106588ab71961cb6505d9109f118 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Jul 2025 23:37:00 +0200 Subject: [PATCH 27/49] Fix unpackaged file --- gdal.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gdal.spec b/gdal.spec index 75bd02e..d1695bf 100644 --- a/gdal.spec +++ b/gdal.spec @@ -625,6 +625,7 @@ done %{_bindir}/pct2rgb %{_bindir}/pct2rgb.py %{_bindir}/rgb2pct +%{_bindir}/rgb2pct.py %{_datadir}/bash-completion/completions/gdal2tiles.py %{_datadir}/bash-completion/completions/gdal2xyz.py %{_datadir}/bash-completion/completions/gdalchksum.py From a06f11854540af1777c6eeb41e0f2166c4a6a21f Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 29 Jul 2025 07:35:48 +0200 Subject: [PATCH 28/49] Abort on gdal-cleaner errors --- gdal-cleaner.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index b7f4a8c..2859e69 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e if [ $# -lt 1 ]; then echo "Usage: $0 version pre" From 0086087c3582c8755131cc196f1566260b5a09e2 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 31 Jul 2025 15:49:53 +0200 Subject: [PATCH 29/49] Rebuild (mingw-poppler) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index d1695bf..5e8df05 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.11.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -845,6 +845,9 @@ done %changelog +* Thu Jul 31 2025 Sandro Mani - 3.11.3-2 +- Rebuild (mingw-poppler) + * Sun Jul 27 2025 Sandro Mani - 3.11.3-1 - Update to 3.11.3 From 66ce787be2e6aaf2ee73f0c7d3752a4ace62863b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 13 Aug 2025 10:55:33 -0600 Subject: [PATCH 30/49] Rebuild for libarrow 21 --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 5e8df05..cd13138 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.11.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -845,6 +845,9 @@ done %changelog +* Wed Aug 13 2025 Orion Poplawski - 3.11.3-3 +- Rebuild for libarrow 21 + * Thu Jul 31 2025 Sandro Mani - 3.11.3-2 - Rebuild (mingw-poppler) From bc3cea34024cfe9552c75db256d5418075db5324 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 18 Aug 2025 13:57:32 +0200 Subject: [PATCH 31/49] Rebuilt for Python 3.14.0rc2 bytecode --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index cd13138..c645a33 100644 --- a/gdal.spec +++ b/gdal.spec @@ -47,7 +47,7 @@ Name: gdal Version: 3.11.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -845,6 +845,9 @@ done %changelog +* Mon Aug 18 2025 Python Maint - 3.11.3-4 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Aug 13 2025 Orion Poplawski - 3.11.3-3 - Rebuild for libarrow 21 From bf3daf0173df88faaa97d159de26f2d144049efe Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 21 Aug 2025 17:59:50 -0600 Subject: [PATCH 32/49] Undefine _preserve_static_debuginfo to prevent huge build times --- gdal.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index c645a33..1ba5b9d 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,3 +1,7 @@ +# Without this the build time baloons from 1 hour to more than 46 on i686 +# https://bugzilla.redhat.com/show_bug.cgi?id=2390105 +%undefine _preserve_static_debuginfo + %global run_tests 1 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) @@ -47,7 +51,7 @@ Name: gdal Version: 3.11.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -845,6 +849,9 @@ done %changelog +* Thu Aug 21 2025 Orion Poplawski - 3.11.3-5 +- Undefine _preserve_static_debuginfo to prevent huge build times + * Mon Aug 18 2025 Python Maint - 3.11.3-4 - Rebuilt for Python 3.14.0rc2 bytecode From 377f8594e7658e51ddc687c17d1a9a0668cabd6f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 21 Aug 2025 20:48:25 -0600 Subject: [PATCH 33/49] Add %define _find_debuginfo_opts --no-ar-files --- gdal.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gdal.spec b/gdal.spec index 1ba5b9d..84f2f96 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,6 +1,7 @@ # Without this the build time baloons from 1 hour to more than 46 on i686 # https://bugzilla.redhat.com/show_bug.cgi?id=2390105 %undefine _preserve_static_debuginfo +%define _find_debuginfo_opts --no-ar-files %global run_tests 1 From 136d07b83f83839d7bd2f7ec1804b92aa6134218 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 07:50:13 -0600 Subject: [PATCH 34/49] Rebuild for netcdf 4.9.3 soname bump --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 84f2f96..34f76cb 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Fri Aug 22 2025 Orion Poplawski - 3.11.3-6 +- Rebuild for netcdf 4.9.3 soname bump + * Thu Aug 21 2025 Orion Poplawski - 3.11.3-5 - Undefine _preserve_static_debuginfo to prevent huge build times From e145220ec51e44dfe3f76bb7de1e3a1313ff2673 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 08:38:38 -0600 Subject: [PATCH 35/49] Rebuild for netcdf 4.9.3 soname bump --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 34f76cb..c5dd6a8 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Fri Aug 22 2025 Orion Poplawski - 3.11.3-7 +- Rebuild for netcdf 4.9.3 soname bump + * Fri Aug 22 2025 Orion Poplawski - 3.11.3-6 - Rebuild for netcdf 4.9.3 soname bump From 53a4cd4851f744436b92a75a0fc7b1aded1a2c18 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 14 Sep 2025 16:49:57 +0200 Subject: [PATCH 36/49] Update to 3.11.4 --- .gitignore | 2 ++ gdal.spec | 7 +++++-- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index cba36dd..447458d 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.10.3.tar.gz /gdal-3.11.3-fedora.tar.xz /gdalautotest-3.11.3.tar.gz +/gdal-3.11.4-fedora.tar.xz +/gdalautotest-3.11.4.tar.gz diff --git a/gdal.spec b/gdal.spec index c5dd6a8..e848509 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,8 +51,8 @@ Name: gdal -Version: 3.11.3 -Release: 7%{?dist} +Version: 3.11.4 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Sun Sep 14 2025 Sandro Mani - 3.11.4-1 +- Update to 3.11.4 + * Fri Aug 22 2025 Orion Poplawski - 3.11.3-7 - Rebuild for netcdf 4.9.3 soname bump diff --git a/gdal_utils.patch b/gdal_utils.patch index 26d7480..cab7721 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.11.3-fedora/frmts/iso8211/CMakeLists.txt 2025-07-12 12:33:49.000000000 +0200 -+++ gdal-3.11.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-07-13 12:08:42.843328554 +0200 +diff -rupN --no-dereference gdal-3.11.4-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.4-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.11.4-fedora/frmts/iso8211/CMakeLists.txt 2025-09-04 12:00:20.000000000 +0200 ++++ gdal-3.11.4-fedora-new/frmts/iso8211/CMakeLists.txt 2025-09-14 16:47:14.260340446 +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.11.3-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.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.11.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-12 12:33:50.000000000 +0200 -+++ gdal-3.11.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-07-13 12:08:42.843906384 +0200 +diff -rupN --no-dereference gdal-3.11.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.11.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-09-04 12:00:21.000000000 +0200 ++++ gdal-3.11.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-09-14 16:47:14.260642007 +0200 @@ -35,7 +35,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) endif() diff --git a/sources b/sources index dabdefb..bbee103 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.11.3-fedora.tar.xz) = 3ca3940387f414b98845cf3ac62988ba4a5fd0b18e2f95cbc9373012c70c8600327b119e176795dc6fd90f9066f4b201feadfa78f037c5599e0c14ad6cf4531b -SHA512 (gdalautotest-3.11.3.tar.gz) = b7a42317c02e0cd268c77bb77e2c8e2742d4611f228a1f8a7cd8c6f27c0d854249ec6410af2a9848cdc18b7080b29cd6ff15478ab78f2eb6b3ecd2183f3a0d69 +SHA512 (gdal-3.11.4-fedora.tar.xz) = 15d6883d60952fb8c4fab6df8c956faa1d66ad20875655f3dba1b938b45f7bf4cb090a0bfe3cf5d77d6698d83477f5bd593efb7f0e047dfc806472681c27ea47 +SHA512 (gdalautotest-3.11.4.tar.gz) = c8f4e4739040f27fa092d132e14ff1196ae9639d8f74b3244d19390a60ee02963574215bc0e48f5163d575e83fc0185480a22eed35a1192c99cbf80f7bb062af From d0879d33537b763ca9347581a72bc54d5af09c03 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 14 Sep 2025 17:19:19 +0200 Subject: [PATCH 37/49] Fix %files --- gdal.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/gdal.spec b/gdal.spec index e848509..f08fb77 100644 --- a/gdal.spec +++ b/gdal.spec @@ -633,10 +633,7 @@ done %{_bindir}/rgb2pct.py %{_datadir}/bash-completion/completions/gdal2tiles.py %{_datadir}/bash-completion/completions/gdal2xyz.py -%{_datadir}/bash-completion/completions/gdalchksum.py %{_datadir}/bash-completion/completions/gdalcompare.py -%{_datadir}/bash-completion/completions/gdalident.py -%{_datadir}/bash-completion/completions/gdalimport.py %{_datadir}/bash-completion/completions/gdalmove.py %{_datadir}/bash-completion/completions/gdal_calc.py %{_datadir}/bash-completion/completions/gdal-config From d354dcf08c1c959c8cbd0a20657bb55a9a9a6ff6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 14 Sep 2025 17:40:05 +0200 Subject: [PATCH 38/49] Fix unpackaged files --- gdal.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdal.spec b/gdal.spec index f08fb77..11e7a46 100644 --- a/gdal.spec +++ b/gdal.spec @@ -639,12 +639,15 @@ done %{_datadir}/bash-completion/completions/gdal-config %{_datadir}/bash-completion/completions/gdal_edit.py %{_datadir}/bash-completion/completions/gdal_fillnodata.py +%{_datadir}/bash-completion/completions/gdal_footprint %{_datadir}/bash-completion/completions/gdal_merge.py %{_datadir}/bash-completion/completions/gdal_polygonize.py %{_datadir}/bash-completion/completions/gdal_proximity.py %{_datadir}/bash-completion/completions/gdal_retile.py %{_datadir}/bash-completion/completions/gdal_sieve.py %{_datadir}/bash-completion/completions/ogrmerge.py +%{_datadir}/bash-completion/completions/ogr_layer_algebra.py +%{_datadir}/bash-completion/completions/sozip %{_mandir}/man1/gdal2tiles.1* %{_mandir}/man1/gdal_calc.1* %{_mandir}/man1/gdalcompare.1* From b1f662fa46ba37d408eb460ba2992f32044f334b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 17 Sep 2025 15:45:07 +0200 Subject: [PATCH 39/49] BR: muparser-devel --- gdal.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 11e7a46..29b08f5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -126,6 +126,7 @@ BuildRequires: libzstd-devel %if 0%{?with_mysql} BuildRequires: mariadb-connector-c-devel %endif +BuildRequires: muParser-devel BuildRequires: netcdf-devel BuildRequires: openexr-devel BuildRequires: openssl-devel-engine @@ -850,6 +851,9 @@ done %changelog +* Wed Sep 17 2025 Sandro Mani - 3.11.4-2 +- BR: muparser-devel + * Sun Sep 14 2025 Sandro Mani - 3.11.4-1 - Update to 3.11.4 From d85d81a7bf6b0528cdba161db42ab31abb20e037 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 17 Sep 2025 23:13:58 -0400 Subject: [PATCH 40/49] Package manpages and shell completions together with the respective commands gdal_footprint and sozip are in the main package. gdal-config is in the gdal-devel subpackage, but all other gdal-* manpages document subcommands of the gdal command in the main package. This also fixes the build without python3 (e.g. RHEL/ELN). --- gdal.spec | 270 +++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 134 deletions(-) diff --git a/gdal.spec b/gdal.spec index 29b08f5..f6fd232 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -512,6 +512,7 @@ done %{_datadir}/bash-completion/completions/gdal %{_datadir}/bash-completion/completions/gdal_contour %{_datadir}/bash-completion/completions/gdal_create +%{_datadir}/bash-completion/completions/gdal_footprint %{_datadir}/bash-completion/completions/gdal_grid %{_datadir}/bash-completion/completions/gdal_rasterize %{_datadir}/bash-completion/completions/gdal_translate @@ -531,140 +532,7 @@ done %{_datadir}/bash-completion/completions/ogrinfo %{_datadir}/bash-completion/completions/ogrlineref %{_datadir}/bash-completion/completions/ogrtindex -%{_mandir}/man1/gdaladdo.1.* -%{_mandir}/man1/gdalbuildvrt.1.* -%{_mandir}/man1/gdal-config.1.* -%{_mandir}/man1/gdal_contour.1.* -%{_mandir}/man1/gdal_create.1.* -%{_mandir}/man1/gdaldem.1.* -%{_mandir}/man1/gdal_footprint.1.* -%{_mandir}/man1/gdal_grid.1.* -%{_mandir}/man1/gdalinfo.1.* -%{_mandir}/man1/gdallocationinfo.1.* -%{_mandir}/man1/gdalmanage.1.* -%{_mandir}/man1/gdalmdiminfo.1.* -%{_mandir}/man1/gdalmdimtranslate.1.* -%{_mandir}/man1/gdal_rasterize.1.* -%{_mandir}/man1/gdalsrsinfo.1.* -%{_mandir}/man1/gdaltindex.1.* -%{_mandir}/man1/gdaltransform.1.* -%{_mandir}/man1/gdal_translate.1.* -%{_mandir}/man1/gdal_viewshed.1.* -%{_mandir}/man1/gdalwarp.1.* -%{_mandir}/man1/gnmanalyse.1.* -%{_mandir}/man1/gnmmanage.1.* -%{_mandir}/man1/nearblack.1.* -%{_mandir}/man1/ogr2ogr.1.* -%{_mandir}/man1/ogrinfo.1.* -%{_mandir}/man1/ogrlineref.1.* -%{_mandir}/man1/ogrtindex.1.* -%{_mandir}/man1/sozip.1.* - -%files libs -%license LICENSE.TXT -%doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora -%{_libdir}/libgdal.so.37 -%{_libdir}/libgdal.so.37.* -%{_datadir}/%{name}/ -%{_libdir}/gdalplugins/ - -%files devel -%{_bindir}/%{name}-config -%{_bindir}/%{name}-config-%{cpuarch} -%{_includedir}/%{name}/ -%{_libdir}/lib%{name}.so -%{_libdir}/cmake/gdal/ -%{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man1/gdal-config.1* - -%if %{with java} -%files java -%{_jnidir}/%{name}/gdal-%{version}-sources.jar -%{_jnidir}/%{name}/gdal-%{version}.jar -%{_jnidir}/%{name}/gdal-%{version}.pom -%{_jnidir}/%{name}/libgdalalljni.so - -%files javadoc -%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar -%endif - -%if %{with python3} -%files -n python3-gdal -%doc swig/python/README.rst -%{python3_sitearch}/GDAL-%{version}-py*.egg-info/ -%{python3_sitearch}/osgeo/ -%{python3_sitearch}/osgeo_utils/ - -%files python-tools -%{_bindir}/gdal2tiles -%{_bindir}/gdal2tiles.py -%{_bindir}/gdal2xyz -%{_bindir}/gdal2xyz.py -%{_bindir}/gdalattachpct -%{_bindir}/gdalattachpct.py -%{_bindir}/gdal_calc -%{_bindir}/gdal_calc.py -%{_bindir}/gdalcompare -%{_bindir}/gdalcompare.py -%{_bindir}/gdal_edit -%{_bindir}/gdal_edit.py -%{_bindir}/gdal_fillnodata -%{_bindir}/gdal_fillnodata.py -%{_bindir}/gdal_merge -%{_bindir}/gdal_merge.py -%{_bindir}/gdalmove -%{_bindir}/gdalmove.py -%{_bindir}/gdal_pansharpen -%{_bindir}/gdal_pansharpen.py -%{_bindir}/gdal_polygonize -%{_bindir}/gdal_polygonize.py -%{_bindir}/gdal_proximity -%{_bindir}/gdal_proximity.py -%{_bindir}/gdal_retile -%{_bindir}/gdal_retile.py -%{_bindir}/gdal_sieve -%{_bindir}/gdal_sieve.py -%{_bindir}/ogr_layer_algebra -%{_bindir}/ogr_layer_algebra.py -%{_bindir}/ogrmerge -%{_bindir}/ogrmerge.py -%{_bindir}/pct2rgb -%{_bindir}/pct2rgb.py -%{_bindir}/rgb2pct -%{_bindir}/rgb2pct.py -%{_datadir}/bash-completion/completions/gdal2tiles.py -%{_datadir}/bash-completion/completions/gdal2xyz.py -%{_datadir}/bash-completion/completions/gdalcompare.py -%{_datadir}/bash-completion/completions/gdalmove.py -%{_datadir}/bash-completion/completions/gdal_calc.py -%{_datadir}/bash-completion/completions/gdal-config -%{_datadir}/bash-completion/completions/gdal_edit.py -%{_datadir}/bash-completion/completions/gdal_fillnodata.py -%{_datadir}/bash-completion/completions/gdal_footprint -%{_datadir}/bash-completion/completions/gdal_merge.py -%{_datadir}/bash-completion/completions/gdal_polygonize.py -%{_datadir}/bash-completion/completions/gdal_proximity.py -%{_datadir}/bash-completion/completions/gdal_retile.py -%{_datadir}/bash-completion/completions/gdal_sieve.py -%{_datadir}/bash-completion/completions/ogrmerge.py -%{_datadir}/bash-completion/completions/ogr_layer_algebra.py %{_datadir}/bash-completion/completions/sozip -%{_mandir}/man1/gdal2tiles.1* -%{_mandir}/man1/gdal_calc.1* -%{_mandir}/man1/gdalcompare.1* -%{_mandir}/man1/gdal_edit.1* -%{_mandir}/man1/gdal_fillnodata.1* -%{_mandir}/man1/gdal_merge.1* -%{_mandir}/man1/gdalmove.1* -%{_mandir}/man1/gdal_pansharpen.1* -%{_mandir}/man1/gdal_polygonize.1* -%{_mandir}/man1/gdal_proximity.1* -%{_mandir}/man1/gdal_retile.1* -%{_mandir}/man1/gdal_sieve.1* -%{_mandir}/man1/ogr_layer_algebra.1* -%{_mandir}/man1/ogrmerge.1* -%{_mandir}/man1/pct2rgb.1* -%{_mandir}/man1/rgb2pct.1* %{_mandir}/man1/gdal-convert.1* %{_mandir}/man1/gdal-info.1* %{_mandir}/man1/gdal-mdim-convert.1* @@ -733,6 +601,137 @@ done %{_mandir}/man1/gdal-vsi-sync.1* %{_mandir}/man1/gdal-vsi.1* %{_mandir}/man1/gdal.1* +%{_mandir}/man1/gdaladdo.1.* +%{_mandir}/man1/gdalbuildvrt.1.* +%{_mandir}/man1/gdal_contour.1.* +%{_mandir}/man1/gdal_create.1.* +%{_mandir}/man1/gdaldem.1.* +%{_mandir}/man1/gdal_footprint.1.* +%{_mandir}/man1/gdal_grid.1.* +%{_mandir}/man1/gdalinfo.1.* +%{_mandir}/man1/gdallocationinfo.1.* +%{_mandir}/man1/gdalmanage.1.* +%{_mandir}/man1/gdalmdiminfo.1.* +%{_mandir}/man1/gdalmdimtranslate.1.* +%{_mandir}/man1/gdal_rasterize.1.* +%{_mandir}/man1/gdalsrsinfo.1.* +%{_mandir}/man1/gdaltindex.1.* +%{_mandir}/man1/gdaltransform.1.* +%{_mandir}/man1/gdal_translate.1.* +%{_mandir}/man1/gdal_viewshed.1.* +%{_mandir}/man1/gdalwarp.1.* +%{_mandir}/man1/gnmanalyse.1.* +%{_mandir}/man1/gnmmanage.1.* +%{_mandir}/man1/nearblack.1.* +%{_mandir}/man1/ogr2ogr.1.* +%{_mandir}/man1/ogrinfo.1.* +%{_mandir}/man1/ogrlineref.1.* +%{_mandir}/man1/ogrtindex.1.* +%{_mandir}/man1/sozip.1.* + +%files libs +%license LICENSE.TXT +%doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora +%{_libdir}/libgdal.so.37 +%{_libdir}/libgdal.so.37.* +%{_datadir}/%{name}/ +%{_libdir}/gdalplugins/ + +%files devel +%{_bindir}/%{name}-config +%{_bindir}/%{name}-config-%{cpuarch} +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}.so +%{_libdir}/cmake/gdal/ +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/bash-completion/completions/gdal-config +%{_mandir}/man1/gdal-config.1* + +%if %{with java} +%files java +%{_jnidir}/%{name}/gdal-%{version}-sources.jar +%{_jnidir}/%{name}/gdal-%{version}.jar +%{_jnidir}/%{name}/gdal-%{version}.pom +%{_jnidir}/%{name}/libgdalalljni.so + +%files javadoc +%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar +%endif + +%if %{with python3} +%files -n python3-gdal +%doc swig/python/README.rst +%{python3_sitearch}/GDAL-%{version}-py*.egg-info/ +%{python3_sitearch}/osgeo/ +%{python3_sitearch}/osgeo_utils/ + +%files python-tools +%{_bindir}/gdal2tiles +%{_bindir}/gdal2tiles.py +%{_bindir}/gdal2xyz +%{_bindir}/gdal2xyz.py +%{_bindir}/gdalattachpct +%{_bindir}/gdalattachpct.py +%{_bindir}/gdal_calc +%{_bindir}/gdal_calc.py +%{_bindir}/gdalcompare +%{_bindir}/gdalcompare.py +%{_bindir}/gdal_edit +%{_bindir}/gdal_edit.py +%{_bindir}/gdal_fillnodata +%{_bindir}/gdal_fillnodata.py +%{_bindir}/gdal_merge +%{_bindir}/gdal_merge.py +%{_bindir}/gdalmove +%{_bindir}/gdalmove.py +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_pansharpen.py +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_polygonize.py +%{_bindir}/gdal_proximity +%{_bindir}/gdal_proximity.py +%{_bindir}/gdal_retile +%{_bindir}/gdal_retile.py +%{_bindir}/gdal_sieve +%{_bindir}/gdal_sieve.py +%{_bindir}/ogr_layer_algebra +%{_bindir}/ogr_layer_algebra.py +%{_bindir}/ogrmerge +%{_bindir}/ogrmerge.py +%{_bindir}/pct2rgb +%{_bindir}/pct2rgb.py +%{_bindir}/rgb2pct +%{_bindir}/rgb2pct.py +%{_datadir}/bash-completion/completions/gdal2tiles.py +%{_datadir}/bash-completion/completions/gdal2xyz.py +%{_datadir}/bash-completion/completions/gdalcompare.py +%{_datadir}/bash-completion/completions/gdalmove.py +%{_datadir}/bash-completion/completions/gdal_calc.py +%{_datadir}/bash-completion/completions/gdal_edit.py +%{_datadir}/bash-completion/completions/gdal_fillnodata.py +%{_datadir}/bash-completion/completions/gdal_merge.py +%{_datadir}/bash-completion/completions/gdal_polygonize.py +%{_datadir}/bash-completion/completions/gdal_proximity.py +%{_datadir}/bash-completion/completions/gdal_retile.py +%{_datadir}/bash-completion/completions/gdal_sieve.py +%{_datadir}/bash-completion/completions/ogrmerge.py +%{_datadir}/bash-completion/completions/ogr_layer_algebra.py +%{_mandir}/man1/gdal2tiles.1* +%{_mandir}/man1/gdal_calc.1* +%{_mandir}/man1/gdalcompare.1* +%{_mandir}/man1/gdal_edit.1* +%{_mandir}/man1/gdal_fillnodata.1* +%{_mandir}/man1/gdal_merge.1* +%{_mandir}/man1/gdalmove.1* +%{_mandir}/man1/gdal_pansharpen.1* +%{_mandir}/man1/gdal_polygonize.1* +%{_mandir}/man1/gdal_proximity.1* +%{_mandir}/man1/gdal_retile.1* +%{_mandir}/man1/gdal_sieve.1* +%{_mandir}/man1/ogr_layer_algebra.1* +%{_mandir}/man1/ogrmerge.1* +%{_mandir}/man1/pct2rgb.1* +%{_mandir}/man1/rgb2pct.1* %endif %if %{with mingw} @@ -851,6 +850,9 @@ done %changelog +* Thu Sep 18 2025 Yaakov Selkowitz - 3.11.4-3 +- Package manpages and shell completions together with the respective commands + * Wed Sep 17 2025 Sandro Mani - 3.11.4-2 - BR: muparser-devel From 38126bb718c31e8253fe365f0f17ce717d4e063f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:17:44 +0200 Subject: [PATCH 41/49] Rebuilt for Python 3.14.0rc3 bytecode --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index f6fd232..eba1dd4 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Fri Sep 19 2025 Python Maint - 3.11.4-4 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Sep 18 2025 Yaakov Selkowitz - 3.11.4-3 - Package manpages and shell completions together with the respective commands From f810f3bd7c75cfebf591c5c0377cf39ab81b568d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Oct 2025 02:21:08 -0400 Subject: [PATCH 42/49] Fix manpage file listings Neither the compression of manpages nor the format thereof should be assumed. This fixed the Fedora 43 flatpak build. https://docs.fedoraproject.org/en-US/packaging-guidelines/#_manpages --- gdal.spec | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gdal.spec b/gdal.spec index eba1dd4..d5be908 100644 --- a/gdal.spec +++ b/gdal.spec @@ -601,33 +601,33 @@ done %{_mandir}/man1/gdal-vsi-sync.1* %{_mandir}/man1/gdal-vsi.1* %{_mandir}/man1/gdal.1* -%{_mandir}/man1/gdaladdo.1.* -%{_mandir}/man1/gdalbuildvrt.1.* -%{_mandir}/man1/gdal_contour.1.* -%{_mandir}/man1/gdal_create.1.* -%{_mandir}/man1/gdaldem.1.* -%{_mandir}/man1/gdal_footprint.1.* -%{_mandir}/man1/gdal_grid.1.* -%{_mandir}/man1/gdalinfo.1.* -%{_mandir}/man1/gdallocationinfo.1.* -%{_mandir}/man1/gdalmanage.1.* -%{_mandir}/man1/gdalmdiminfo.1.* -%{_mandir}/man1/gdalmdimtranslate.1.* -%{_mandir}/man1/gdal_rasterize.1.* -%{_mandir}/man1/gdalsrsinfo.1.* -%{_mandir}/man1/gdaltindex.1.* -%{_mandir}/man1/gdaltransform.1.* -%{_mandir}/man1/gdal_translate.1.* -%{_mandir}/man1/gdal_viewshed.1.* -%{_mandir}/man1/gdalwarp.1.* -%{_mandir}/man1/gnmanalyse.1.* -%{_mandir}/man1/gnmmanage.1.* -%{_mandir}/man1/nearblack.1.* -%{_mandir}/man1/ogr2ogr.1.* -%{_mandir}/man1/ogrinfo.1.* -%{_mandir}/man1/ogrlineref.1.* -%{_mandir}/man1/ogrtindex.1.* -%{_mandir}/man1/sozip.1.* +%{_mandir}/man1/gdaladdo.1* +%{_mandir}/man1/gdalbuildvrt.1* +%{_mandir}/man1/gdal_contour.1* +%{_mandir}/man1/gdal_create.1* +%{_mandir}/man1/gdaldem.1* +%{_mandir}/man1/gdal_footprint.1* +%{_mandir}/man1/gdal_grid.1* +%{_mandir}/man1/gdalinfo.1* +%{_mandir}/man1/gdallocationinfo.1* +%{_mandir}/man1/gdalmanage.1* +%{_mandir}/man1/gdalmdiminfo.1* +%{_mandir}/man1/gdalmdimtranslate.1* +%{_mandir}/man1/gdal_rasterize.1* +%{_mandir}/man1/gdalsrsinfo.1* +%{_mandir}/man1/gdaltindex.1* +%{_mandir}/man1/gdaltransform.1* +%{_mandir}/man1/gdal_translate.1* +%{_mandir}/man1/gdal_viewshed.1* +%{_mandir}/man1/gdalwarp.1* +%{_mandir}/man1/gnmanalyse.1* +%{_mandir}/man1/gnmmanage.1* +%{_mandir}/man1/nearblack.1* +%{_mandir}/man1/ogr2ogr.1* +%{_mandir}/man1/ogrinfo.1* +%{_mandir}/man1/ogrlineref.1* +%{_mandir}/man1/ogrtindex.1* +%{_mandir}/man1/sozip.1* %files libs %license LICENSE.TXT From 4fc48a16c43f38539bd1b3305e05b64eb87e0824 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 9 Oct 2025 03:23:08 -0400 Subject: [PATCH 43/49] Rebuilt for java-25-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk --- gdal.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gdal.spec b/gdal.spec index d5be908..525c7c0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -157,9 +157,9 @@ BuildRequires: python3dist(lxml) >= 4.5.1 # Java %if %{with java} # For 'mvn_artifact' and 'mvn_install' -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: jpackage-utils %endif @@ -850,6 +850,9 @@ done %changelog +* Thu Oct 09 2025 Yaakov Selkowitz - 3.11.4-5 +- Rebuilt for java-25-openjdk as system jdk + * Fri Sep 19 2025 Python Maint - 3.11.4-4 - Rebuilt for Python 3.14.0rc3 bytecode From b7e01d99177df1b9c5808418c40e7c97953d6e5a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 29 Oct 2025 09:24:26 -0400 Subject: [PATCH 44/49] Rebuild for libarrow 22 Signed-off-by: Stephen Gallagher --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 525c7c0..00a04d0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.11.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Wed Oct 29 2025 Stephen Gallagher - 3.11.4-6 +- Rebuild for libarrow 22 + * Thu Oct 09 2025 Yaakov Selkowitz - 3.11.4-5 - Rebuilt for java-25-openjdk as system jdk From 2665a7f24c0056d1838f8019ad58da8ad2119297 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 7 Nov 2025 14:02:28 +0100 Subject: [PATCH 45/49] Update to 3.11.5 --- .gitignore | 2 ++ gdal.spec | 7 +++++-- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 447458d..5f88cba 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.11.3.tar.gz /gdal-3.11.4-fedora.tar.xz /gdalautotest-3.11.4.tar.gz +/gdal-3.11.5-fedora.tar.xz +/gdalautotest-3.11.5.tar.gz diff --git a/gdal.spec b/gdal.spec index 00a04d0..dd329ba 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,8 +51,8 @@ Name: gdal -Version: 3.11.4 -Release: 6%{?dist} +Version: 3.11.5 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -850,6 +850,9 @@ done %changelog +* Fri Nov 07 2025 Sandro Mani - 3.11.5-1 +- Update to 3.11.5 + * Wed Oct 29 2025 Stephen Gallagher - 3.11.4-6 - Rebuild for libarrow 22 diff --git a/gdal_utils.patch b/gdal_utils.patch index cab7721..151044c 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.11.4-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.4-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.11.4-fedora/frmts/iso8211/CMakeLists.txt 2025-09-04 12:00:20.000000000 +0200 -+++ gdal-3.11.4-fedora-new/frmts/iso8211/CMakeLists.txt 2025-09-14 16:47:14.260340446 +0200 +diff -rupN --no-dereference gdal-3.11.5-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.5-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.11.5-fedora/frmts/iso8211/CMakeLists.txt 2025-10-29 12:33:54.000000000 +0100 ++++ gdal-3.11.5-fedora-new/frmts/iso8211/CMakeLists.txt 2025-11-07 13:53:00.271838116 +0100 @@ -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.11.4-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.11.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.11.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-09-04 12:00:21.000000000 +0200 -+++ gdal-3.11.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-09-14 16:47:14.260642007 +0200 +diff -rupN --no-dereference gdal-3.11.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.11.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-10-29 12:33:55.000000000 +0100 ++++ gdal-3.11.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-07 13:53:00.272126363 +0100 @@ -35,7 +35,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) endif() diff --git a/sources b/sources index bbee103..032d71f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.11.4-fedora.tar.xz) = 15d6883d60952fb8c4fab6df8c956faa1d66ad20875655f3dba1b938b45f7bf4cb090a0bfe3cf5d77d6698d83477f5bd593efb7f0e047dfc806472681c27ea47 -SHA512 (gdalautotest-3.11.4.tar.gz) = c8f4e4739040f27fa092d132e14ff1196ae9639d8f74b3244d19390a60ee02963574215bc0e48f5163d575e83fc0185480a22eed35a1192c99cbf80f7bb062af +SHA512 (gdal-3.11.5-fedora.tar.xz) = a5492d5f45a35bbadc7c4af2b24ed40743c7f36e4c8b0824373495b3d2c032eb940e1239b64252920db9dd5bc0b2253052dbaac27ee9c69005b0957c5f6700a3 +SHA512 (gdalautotest-3.11.5.tar.gz) = cb97beed516fa74d3744da62e8cf0c1438d32063ec8bc5fea5b8a4bc3c7097553bb4045766e7d77f7c87456f44b37aae0961ff73b1a5f8cd4ad1ecb5351c3986 From c006213de01cc4735b1bc102481c8fa7c50b0288 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 23 Nov 2025 10:32:41 +0100 Subject: [PATCH 46/49] Update to 3.12.0 --- .gitignore | 3 ++ gdal.spec | 110 ++++++++++++++++++++++++++++++----------------- gdal_utils.patch | 14 +++--- sources | 4 +- 4 files changed, 83 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index 5f88cba..7f7eb03 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,6 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-3.11.4.tar.gz /gdal-3.11.5-fedora.tar.xz /gdalautotest-3.11.5.tar.gz +/gdal-3.12.0-fedora.tar.xz +/gdal-3.12.0.tar.xz +/gdalautotest-3.12.0.zip diff --git a/gdal.spec b/gdal.spec index dd329ba..269a56d 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,7 +51,7 @@ Name: gdal -Version: 3.11.5 +Version: 3.12.0 Release: 1%{?dist} Summary: GIS file format library License: MIT @@ -60,7 +60,7 @@ URL: http://www.gdal.org # See PROVENANCE.TXT-fedora and the cleaner script for details! Source0: %{name}-%{version}%{?pre:%pre}-fedora.tar.xz -Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.tar.gz +Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.zip # Multilib compatible cpl-config.h header Source2: cpl-config.h # Multilib compatible gdal-config script @@ -93,6 +93,7 @@ BuildRequires: proj-devel >= 5.2.0 BuildRequires: sqlite-devel BuildRequires: swig BuildRequires: unixODBC-devel +BuildRequires: unzip BuildRequires: xz-devel BuildRequires: zlib-devel @@ -396,7 +397,7 @@ rm -rf mrf/LERCV1 rm -rf third_party/LercLib # Setup autotest directory -tar xf %{SOURCE1} +unzip %{SOURCE1} mv %{name}autotest-%{version}%{?pre:%pre} autotest # Need to patch autotest @@ -471,8 +472,10 @@ done %if 0%{run_tests} %check +%ifnarch s390x %ctest || : %endif +%endif %files @@ -533,15 +536,40 @@ done %{_datadir}/bash-completion/completions/ogrlineref %{_datadir}/bash-completion/completions/ogrtindex %{_datadir}/bash-completion/completions/sozip +%{_mandir}/man1/gdal.1* +%{_mandir}/man1/gdaladdo.1* +%{_mandir}/man1/gdalbuildvrt.1* +%{_mandir}/man1/gdal_contour.1* %{_mandir}/man1/gdal-convert.1* +%{_mandir}/man1/gdal_create.1* +%{_mandir}/man1/gdal-dataset.1.gz +%{_mandir}/man1/gdal-dataset-copy.1.gz +%{_mandir}/man1/gdal-dataset-delete.1.gz +%{_mandir}/man1/gdal-dataset-identify.1.gz +%{_mandir}/man1/gdal-dataset-rename.1.gz +%{_mandir}/man1/gdaldem.1* +%{_mandir}/man1/gdal_footprint.1* +%{_mandir}/man1/gdal_grid.1* %{_mandir}/man1/gdal-info.1* +%{_mandir}/man1/gdalinfo.1* +%{_mandir}/man1/gdallocationinfo.1* +%{_mandir}/man1/gdalmanage.1* +%{_mandir}/man1/gdal-mdim.1* %{_mandir}/man1/gdal-mdim-convert.1* %{_mandir}/man1/gdal-mdim-info.1* -%{_mandir}/man1/gdal-mdim.1* +%{_mandir}/man1/gdalmdiminfo.1* +%{_mandir}/man1/gdal-mdim-mosaic.1.gz +%{_mandir}/man1/gdalmdimtranslate.1* +%{_mandir}/man1/gdal-pipeline.1.gz +%{_mandir}/man1/gdal-raster.1* +%{_mandir}/man1/gdal-raster-as-features.1.gz +%{_mandir}/man1/gdal-raster-aspect.1.gz %{_mandir}/man1/gdal-raster-calc.1* %{_mandir}/man1/gdal-raster-clean-collar.1* %{_mandir}/man1/gdal-raster-clip.1* +%{_mandir}/man1/gdal-raster-color-blend.1.gz %{_mandir}/man1/gdal-raster-color-map.1* +%{_mandir}/man1/gdal-raster-compare.1.gz %{_mandir}/man1/gdal-raster-contour.1* %{_mandir}/man1/gdal-raster-convert.1* %{_mandir}/man1/gdal-raster-create.1* @@ -551,15 +579,22 @@ done %{_mandir}/man1/gdal-raster-hillshade.1* %{_mandir}/man1/gdal-raster-index.1* %{_mandir}/man1/gdal-raster-info.1* +%{_mandir}/man1/gdal_rasterize.1* %{_mandir}/man1/gdal-raster-mosaic.1* +%{_mandir}/man1/gdal-raster-neighbors.1.gz +%{_mandir}/man1/gdal-raster-nodata-to-alpha.1.gz %{_mandir}/man1/gdal-raster-overview-add.1* %{_mandir}/man1/gdal-raster-overview-delete.1* +%{_mandir}/man1/gdal-raster-overview-refresh.1.gz +%{_mandir}/man1/gdal-raster-pansharpen.1.gz %{_mandir}/man1/gdal-raster-pipeline.1* %{_mandir}/man1/gdal-raster-pixel-info.1* %{_mandir}/man1/gdal-raster-polygonize.1* +%{_mandir}/man1/gdal-raster-proximity.1.gz %{_mandir}/man1/gdal-raster-reclassify.1* %{_mandir}/man1/gdal-raster-reproject.1* %{_mandir}/man1/gdal-raster-resize.1* +%{_mandir}/man1/gdal-raster-rgb-to-palette.1.gz %{_mandir}/man1/gdal-raster-roughness.1* %{_mandir}/man1/gdal-raster-scale.1* %{_mandir}/man1/gdal-raster-select.1* @@ -571,54 +606,48 @@ done %{_mandir}/man1/gdal-raster-tpi.1* %{_mandir}/man1/gdal-raster-tri.1* %{_mandir}/man1/gdal-raster-unscale.1* +%{_mandir}/man1/gdal-raster-update.1.gz %{_mandir}/man1/gdal-raster-viewshed.1* -%{_mandir}/man1/gdal-raster.1* +%{_mandir}/man1/gdal-raster-zonal-stats.1.gz +%{_mandir}/man1/gdalsrsinfo.1* +%{_mandir}/man1/gdaltindex.1* +%{_mandir}/man1/gdaltransform.1* +%{_mandir}/man1/gdal_translate.1* +%{_mandir}/man1/gdal-vector.1* +%{_mandir}/man1/gdal-vector-buffer.1.gz +%{_mandir}/man1/gdal-vector-check-coverage.1.gz +%{_mandir}/man1/gdal-vector-check-geometry.1.gz +%{_mandir}/man1/gdal-vector-clean-coverage.1.gz %{_mandir}/man1/gdal-vector-clip.1* +%{_mandir}/man1/gdal-vector_concat.1* %{_mandir}/man1/gdal-vector-convert.1* %{_mandir}/man1/gdal-vector-edit.1* +%{_mandir}/man1/gdal-vector-explode-collections.1.gz %{_mandir}/man1/gdal-vector-filter.1* -%{_mandir}/man1/gdal-vector-geom-buffer.1* -%{_mandir}/man1/gdal-vector-geom-explode-collections.1* -%{_mandir}/man1/gdal-vector-geom-make-valid.1* -%{_mandir}/man1/gdal-vector-geom-segmentize.1* -%{_mandir}/man1/gdal-vector-geom-set-type.1* -%{_mandir}/man1/gdal-vector-geom-simplify.1* -%{_mandir}/man1/gdal-vector-geom-swap-xy.1* -%{_mandir}/man1/gdal-vector-geom.1* %{_mandir}/man1/gdal-vector-grid.1* +%{_mandir}/man1/gdal-vector-index.1.gz %{_mandir}/man1/gdal-vector-info.1* +%{_mandir}/man1/gdal-vector-layer-algebra.1.gz +%{_mandir}/man1/gdal-vector-make-point.1.gz +%{_mandir}/man1/gdal-vector-make-valid.1.gz +%{_mandir}/man1/gdal-vector-partition.1.gz %{_mandir}/man1/gdal-vector-pipeline.1* %{_mandir}/man1/gdal-vector-rasterize.1* +%{_mandir}/man1/gdal-vector-segmentize.1.gz %{_mandir}/man1/gdal-vector-select.1* +%{_mandir}/man1/gdal-vector-set-field-type.1.gz +%{_mandir}/man1/gdal-vector-set-geom-type.1.gz +%{_mandir}/man1/gdal-vector-simplify.1.gz %{_mandir}/man1/gdal-vector-sql.1* -%{_mandir}/man1/gdal-vector.1* -%{_mandir}/man1/gdal-vector_concat.1* +%{_mandir}/man1/gdal-vector-swap-xy.1.gz +%{_mandir}/man1/gdal_viewshed.1* +%{_mandir}/man1/gdal-vsi.1* %{_mandir}/man1/gdal-vsi-copy.1* %{_mandir}/man1/gdal-vsi-delete.1* %{_mandir}/man1/gdal-vsi-list.1* %{_mandir}/man1/gdal-vsi-move.1* %{_mandir}/man1/gdal-vsi-sozip.1* %{_mandir}/man1/gdal-vsi-sync.1* -%{_mandir}/man1/gdal-vsi.1* -%{_mandir}/man1/gdal.1* -%{_mandir}/man1/gdaladdo.1* -%{_mandir}/man1/gdalbuildvrt.1* -%{_mandir}/man1/gdal_contour.1* -%{_mandir}/man1/gdal_create.1* -%{_mandir}/man1/gdaldem.1* -%{_mandir}/man1/gdal_footprint.1* -%{_mandir}/man1/gdal_grid.1* -%{_mandir}/man1/gdalinfo.1* -%{_mandir}/man1/gdallocationinfo.1* -%{_mandir}/man1/gdalmanage.1* -%{_mandir}/man1/gdalmdiminfo.1* -%{_mandir}/man1/gdalmdimtranslate.1* -%{_mandir}/man1/gdal_rasterize.1* -%{_mandir}/man1/gdalsrsinfo.1* -%{_mandir}/man1/gdaltindex.1* -%{_mandir}/man1/gdaltransform.1* -%{_mandir}/man1/gdal_translate.1* -%{_mandir}/man1/gdal_viewshed.1* %{_mandir}/man1/gdalwarp.1* %{_mandir}/man1/gnmanalyse.1* %{_mandir}/man1/gnmmanage.1* @@ -632,8 +661,8 @@ done %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora -%{_libdir}/libgdal.so.37 -%{_libdir}/libgdal.so.37.* +%{_libdir}/libgdal.so.38 +%{_libdir}/libgdal.so.38.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -737,7 +766,7 @@ done %if %{with mingw} %files -n mingw32-%{name} %license LICENSE.TXT -%{mingw32_bindir}/libgdal-37.dll +%{mingw32_bindir}/libgdal-38.dll %{mingw32_bindir}/gdal-config %{mingw32_libdir}/libgdal.dll.a %{mingw32_libdir}/cmake/gdal/ @@ -793,7 +822,7 @@ done %files -n mingw64-%{name} %license LICENSE.TXT -%{mingw64_bindir}/libgdal-37.dll +%{mingw64_bindir}/libgdal-38.dll %{mingw64_bindir}/gdal-config %{mingw64_libdir}/libgdal.dll.a %{mingw64_libdir}/cmake/gdal/ @@ -850,6 +879,9 @@ done %changelog +* Sun Nov 16 2025 Sandro Mani - 3.12.0-1 +- Update to 3.12.0 + * Fri Nov 07 2025 Sandro Mani - 3.11.5-1 - Update to 3.11.5 diff --git a/gdal_utils.patch b/gdal_utils.patch index 151044c..3075bd3 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.11.5-fedora/frmts/iso8211/CMakeLists.txt gdal-3.11.5-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.11.5-fedora/frmts/iso8211/CMakeLists.txt 2025-10-29 12:33:54.000000000 +0100 -+++ gdal-3.11.5-fedora-new/frmts/iso8211/CMakeLists.txt 2025-11-07 13:53:00.271838116 +0100 +diff -rupN --no-dereference gdal-3.12.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.0-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.12.0-fedora/frmts/iso8211/CMakeLists.txt 2025-11-08 00:18:13.000000000 +0100 ++++ gdal-3.12.0-fedora-new/frmts/iso8211/CMakeLists.txt 2025-11-16 10:13:14.149979117 +0100 @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -22,10 +22,10 @@ diff -rupN --no-dereference gdal-3.11.5-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.11.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.11.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.11.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-10-29 12:33:55.000000000 +0100 -+++ gdal-3.11.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-07 13:53:00.272126363 +0100 -@@ -35,7 +35,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) +diff -rupN --no-dereference gdal-3.12.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.12.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-08 00:18:14.000000000 +0100 ++++ gdal-3.12.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-16 10:13:14.150285308 +0100 +@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) endif() diff --git a/sources b/sources index 032d71f..bfd7f58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.11.5-fedora.tar.xz) = a5492d5f45a35bbadc7c4af2b24ed40743c7f36e4c8b0824373495b3d2c032eb940e1239b64252920db9dd5bc0b2253052dbaac27ee9c69005b0957c5f6700a3 -SHA512 (gdalautotest-3.11.5.tar.gz) = cb97beed516fa74d3744da62e8cf0c1438d32063ec8bc5fea5b8a4bc3c7097553bb4045766e7d77f7c87456f44b37aae0961ff73b1a5f8cd4ad1ecb5351c3986 +SHA512 (gdal-3.12.0-fedora.tar.xz) = de6a9121c6573eaeae45db93c3ea444b7c7de4ed1ca56dc1f4f3e915b6e4b29836bd09524231d145c68b7b13ae54bbeee4968f18fd1a7bbefa1feb7909a01f74 +SHA512 (gdalautotest-3.12.0.zip) = 2309fe081a2a29c2ce23f412552d2b896015789ce45c16e125192d0ec285a25f9c97315a95ef956bcf0514112145c48f8b197b526ba59937ab12166be78edb19 From dcd61ee050b51c9f8653a33e4400dd7674ef81af Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 8 Dec 2025 13:06:20 +0100 Subject: [PATCH 47/49] Rebuild (libtiff) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 269a56d..4475f36 100644 --- a/gdal.spec +++ b/gdal.spec @@ -52,7 +52,7 @@ Name: gdal Version: 3.12.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -879,6 +879,9 @@ done %changelog +* Mon Dec 08 2025 Sandro Mani - 3.12.0-2 +- Rebuild (libtiff) + * Sun Nov 16 2025 Sandro Mani - 3.12.0-1 - Update to 3.12.0 From fc760216de14e3d60e38299db6b8d8b830ffa7b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 18 Dec 2025 23:18:10 +0100 Subject: [PATCH 48/49] Update to 3.12.1 --- .gitignore | 2 ++ gdal.spec | 9 ++++++--- gdal_utils.patch | 12 ++++++------ sources | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 7f7eb03..71e0fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,5 @@ gdalautotest-1.7.0.tar.gz /gdal-3.12.0-fedora.tar.xz /gdal-3.12.0.tar.xz /gdalautotest-3.12.0.zip +/gdal-3.12.1-fedora.tar.xz +/gdalautotest-3.12.1.zip diff --git a/gdal.spec b/gdal.spec index 4475f36..79142e4 100644 --- a/gdal.spec +++ b/gdal.spec @@ -51,8 +51,8 @@ Name: gdal -Version: 3.12.0 -Release: 2%{?dist} +Version: 3.12.1 +Release: 1%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -619,7 +619,7 @@ done %{_mandir}/man1/gdal-vector-check-geometry.1.gz %{_mandir}/man1/gdal-vector-clean-coverage.1.gz %{_mandir}/man1/gdal-vector-clip.1* -%{_mandir}/man1/gdal-vector_concat.1* +%{_mandir}/man1/gdal-vector-concat.1* %{_mandir}/man1/gdal-vector-convert.1* %{_mandir}/man1/gdal-vector-edit.1* %{_mandir}/man1/gdal-vector-explode-collections.1.gz @@ -879,6 +879,9 @@ done %changelog +* Thu Dec 18 2025 Sandro Mani - 3.12.1-1 +- Update to 3.12.1 + * Mon Dec 08 2025 Sandro Mani - 3.12.0-2 - Rebuild (libtiff) diff --git a/gdal_utils.patch b/gdal_utils.patch index 3075bd3..e0eee7c 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gdal-3.12.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.0-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.12.0-fedora/frmts/iso8211/CMakeLists.txt 2025-11-08 00:18:13.000000000 +0100 -+++ gdal-3.12.0-fedora-new/frmts/iso8211/CMakeLists.txt 2025-11-16 10:13:14.149979117 +0100 +diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100 ++++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-12-18 16:35:42.369730740 +0100 @@ -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.12.0-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.12.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.12.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-08 00:18:14.000000000 +0100 -+++ gdal-3.12.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-11-16 10:13:14.150285308 +0100 +diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100 ++++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 16:35:42.369966573 +0100 @@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) endif() diff --git a/sources b/sources index bfd7f58..18aa636 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.12.0-fedora.tar.xz) = de6a9121c6573eaeae45db93c3ea444b7c7de4ed1ca56dc1f4f3e915b6e4b29836bd09524231d145c68b7b13ae54bbeee4968f18fd1a7bbefa1feb7909a01f74 -SHA512 (gdalautotest-3.12.0.zip) = 2309fe081a2a29c2ce23f412552d2b896015789ce45c16e125192d0ec285a25f9c97315a95ef956bcf0514112145c48f8b197b526ba59937ab12166be78edb19 +SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5 +SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5 From 4015c908dd8c4e671dbd9cd33d9175d40773e1be Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 19 Dec 2025 17:45:54 +0100 Subject: [PATCH 49/49] Skip tests also on ppc64le for now --- gdal.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 79142e4..3cb8526 100644 --- a/gdal.spec +++ b/gdal.spec @@ -472,7 +472,8 @@ done %if 0%{run_tests} %check -%ifnarch s390x +# FIXME Tests hang on s390x ppc64le +%ifnarch s390x ppc64le %ctest || : %endif %endif