From 4f2c4aeb34188a0c851d4b7c7e263363a686b9a4 Mon Sep 17 00:00:00 2001 From: Devrim Gunduz Date: Thu, 11 Sep 2025 22:11:50 +0100 Subject: [PATCH] GDAL 3.11: Add a patch to remove checks for the files we remove because of licensing issues. --- .../main/common/gdal311/EL-10/gdal311-cleanup.patch | 1 + .../main/common/gdal311/EL-9/gdal311-cleanup.patch | 1 + .../main/common/gdal311/F-41/gdal311-cleanup.patch | 1 + .../main/common/gdal311/F-42/gdal311-cleanup.patch | 1 + .../common/gdal311/SLES-15/gdal311-cleanup.patch | 1 + .../main/common/gdal311/main/gdal311-cleanup.patch | 13 +++++++++++++ rpm/redhat/main/common/gdal311/main/gdal311.spec | 4 ++++ 7 files changed, 22 insertions(+) create mode 120000 rpm/redhat/main/common/gdal311/EL-10/gdal311-cleanup.patch create mode 120000 rpm/redhat/main/common/gdal311/EL-9/gdal311-cleanup.patch create mode 120000 rpm/redhat/main/common/gdal311/F-41/gdal311-cleanup.patch create mode 120000 rpm/redhat/main/common/gdal311/F-42/gdal311-cleanup.patch create mode 120000 rpm/redhat/main/common/gdal311/SLES-15/gdal311-cleanup.patch create mode 100644 rpm/redhat/main/common/gdal311/main/gdal311-cleanup.patch diff --git a/rpm/redhat/main/common/gdal311/EL-10/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/EL-10/gdal311-cleanup.patch new file mode 120000 index 000000000..4a5002c85 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/EL-10/gdal311-cleanup.patch @@ -0,0 +1 @@ +../main/gdal311-cleanup.patch \ No newline at end of file diff --git a/rpm/redhat/main/common/gdal311/EL-9/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/EL-9/gdal311-cleanup.patch new file mode 120000 index 000000000..4a5002c85 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/EL-9/gdal311-cleanup.patch @@ -0,0 +1 @@ +../main/gdal311-cleanup.patch \ No newline at end of file diff --git a/rpm/redhat/main/common/gdal311/F-41/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/F-41/gdal311-cleanup.patch new file mode 120000 index 000000000..4a5002c85 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/F-41/gdal311-cleanup.patch @@ -0,0 +1 @@ +../main/gdal311-cleanup.patch \ No newline at end of file diff --git a/rpm/redhat/main/common/gdal311/F-42/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/F-42/gdal311-cleanup.patch new file mode 120000 index 000000000..4a5002c85 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/F-42/gdal311-cleanup.patch @@ -0,0 +1 @@ +../main/gdal311-cleanup.patch \ No newline at end of file diff --git a/rpm/redhat/main/common/gdal311/SLES-15/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/SLES-15/gdal311-cleanup.patch new file mode 120000 index 000000000..4a5002c85 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/SLES-15/gdal311-cleanup.patch @@ -0,0 +1 @@ +../main/gdal311-cleanup.patch \ No newline at end of file diff --git a/rpm/redhat/main/common/gdal311/main/gdal311-cleanup.patch b/rpm/redhat/main/common/gdal311/main/gdal311-cleanup.patch new file mode 100644 index 000000000..a02458653 --- /dev/null +++ b/rpm/redhat/main/common/gdal311/main/gdal311-cleanup.patch @@ -0,0 +1,13 @@ +--- ogr/CMakeLists.txt.old 2025-09-11 22:06:20.275284282 +0100 ++++ ogr/CMakeLists.txt 2025-09-11 22:06:52.838287189 +0100 +@@ -76,10 +76,7 @@ + + set(GDAL_DATA_FILES + LICENSE.TXT +- ${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt +- ${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt + ${CMAKE_CURRENT_SOURCE_DIR}/data/epsg.wkt +- ${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt + ${CMAKE_CURRENT_SOURCE_DIR}/data/ozi_datum.csv + ${CMAKE_CURRENT_SOURCE_DIR}/data/ozi_ellips.csv + ${CMAKE_CURRENT_SOURCE_DIR}/data/pci_datum.txt diff --git a/rpm/redhat/main/common/gdal311/main/gdal311.spec b/rpm/redhat/main/common/gdal311/main/gdal311.spec index 32892af85..423af9890 100644 --- a/rpm/redhat/main/common/gdal311/main/gdal311.spec +++ b/rpm/redhat/main/common/gdal311/main/gdal311.spec @@ -53,6 +53,8 @@ Source5: %{sname}-cleaner.sh Source6: %{name}-pgdg-libs.conf +Patch0: %{name}-cleanup.patch + # lz4 and bash-completion dependencies %if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499 BuildRequires: liblz4-devel bash-completion-devel @@ -276,6 +278,8 @@ manipulating GDAL file format library %prep %setup -q -n %{sname}-%{version}-fedora +%patch -P 0 -p0 + # Delete bundled libraries rm -rf frmts/png/libpng rm -rf frmts/gif/giflib -- 2.39.5