rpms/gdal
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Sync with fedora to make package up to date

Browse Source 
Resolves: RHEL-81596
This commit is contained in:
Ales Nezbeda 2025-06-09 14:55:01 +02:00
parent 69e4893156
commit c3e4ee187e
18 changed files with 1144 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
.gitignore vendored
View File

@ -57,3 +57,58 @@ gdalautotest-1.7.0.tar.gz
/gdal-3.2.0-fedora.tar.xz
/gdal-3.2.1-fedora.tar.xz
/gdalautotest-3.2.1.tar.gz
/gdalautotest-3.2.2.tar.gz
/gdal-3.2.2-fedora.tar.xz
/gdalautotest-3.3.0.tar.gz
/gdal-3.3.0-fedora.tar.xz
/gdal-3.3.1-fedora.tar.xz
/gdalautotest-3.3.1.tar.gz
/gdal-3.3.2-fedora.tar.xz
/gdalautotest-3.3.2.tar.gz
/gdal-3.3.3-fedora.tar.xz
/gdalautotest-3.3.3.tar.gz
/gdal-3.4.0-fedora.tar.xz
/gdalautotest-3.4.0.tar.gz
/gdal-3.4.1-fedora.tar.xz
/gdalautotest-3.4.1.tar.gz
/gdal-3.4.2-fedora.tar.xz
/gdalautotest-3.4.2.tar.gz
/gdal-3.4.3-fedora.tar.xz
/gdalautotest-3.4.3.tar.gz
/gdalautotest-3.5.0.tar.gz
/gdal-3.5.0-fedora.tar.xz
/gdalautotest-3.5.1.tar.gz
/gdal-3.5.1-fedora.tar.xz
/gdal-3.5.2-fedora.tar.xz
/gdalautotest-3.5.2.tar.gz
/gdal-3.5.3-fedora.tar.xz
/gdalautotest-3.5.3.tar.gz
/gdal-3.6.0-fedora.tar.xz
/gdalautotest-3.6.0.tar.gz
/gdalautotest-3.6.1.tar.gz
/gdal-3.6.1.tar.xz
/gdal-3.6.1-fedora.tar.xz
/gdal-3.6.2-fedora.tar.xz
/gdalautotest-3.6.2.tar.gz
/gdal-3.6.3-fedora.tar.xz
/gdalautotest-3.6.3.tar.gz
/gdal-3.6.4-fedora.tar.xz
/gdalautotest-3.6.4.tar.gz
/gdal-3.7.0-fedora.tar.xz
/gdalautotest-3.7.0.tar.gz
/gdal-3.7.1-fedora.tar.xz
/gdalautotest-3.7.1.tar.gz
/gdal-3.7.2-fedora.tar.xz
/gdalautotest-3.7.2.tar.gz
/gdal-3.7.3-fedora.tar.xz
/gdalautotest-3.7.3.tar.gz
/gdal-3.8.0-fedora.tar.xz
/gdalautotest-3.8.0.tar.gz
/gdal-3.8.1-fedora.tar.xz
/gdalautotest-3.8.1.tar.gz
/gdal-3.8.2-fedora.tar.xz
/gdalautotest-3.8.2.tar.gz
/gdal-3.8.3-fedora.tar.xz
/gdalautotest-3.8.3.tar.gz
/gdal-3.10.3-fedora.tar.xz
/gdalautotest-3.10.3.tar.gz

11
cpl-config.h Normal file
View File

@ -0,0 +1,11 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "gdal/cpl_config-32.h"
#else
#if __WORDSIZE == 64
#include "gdal/cpl_config-64.h"
#else
#error "Unknown word size"
#endif
#endif

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-10
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.installability.functional}

11
gdal-1.9.0-java.patch
View File

@ -1,11 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/swig/java/java.opt gdal-3.2.1-fedora-new/swig/java/java.opt
--- gdal-3.2.1-fedora/swig/java/java.opt 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/swig/java/java.opt 2021-01-04 21:49:35.504249023 +0100
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java
JAR=$(JAVA_HOME)/bin/jar
-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux

11
gdal-3.10.2-integer-types.patch Normal file
View File

@ -0,0 +1,11 @@
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 <limits>
#include <memory>
#include <string>
+#include <cstdint>
#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

21
gdal-cleaner.sh
View File

@ -6,25 +6,32 @@ if [ $# -lt 1 ]; then
fi
VERSION="$1"
PRE="$2"
wget https://github.com/OSGeo/gdal/releases/download/v$VERSION/gdal-$VERSION.tar.gz
if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
fi
tar xvf gdal-"${VERSION}".tar.gz
if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script"
exit 1
fi
tar xvf gdal-"${VERSION}${PRE}".tar.xz
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
rm data/cubewerx_extra.wkt
rm data/esri_extra.wkt
rm data/esri_Wisconsin_extra.wkt
rm data/esri_StatePlane_extra.wkt
rm data/ecw_cs.wkt
#Really necessary?
rm -r swig/php
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
popd
#TODO: Insert Provenance file
tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora

11
gdal-config Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
ARCH=$(uname -m)
case $ARCH in
x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
gdal-config-64 ${*}
;;
*)
gdal-config-32 ${*}
;;
esac

33
gdal-gcc11.patch
View File

@ -1,33 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2020-12-29 13:19:32.000000000 +0100
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp 2021-01-04 21:49:36.914247237 +0100
@@ -34,6 +34,7 @@
#include <limits>
#include <math.h>
#include <algorithm>
+#include <limits>
//------------------------------------------------------------------------------
// CADVector
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2020-12-29 13:19:31.000000000 +0100
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2021-01-04 21:49:36.913247238 +0100
@@ -39,6 +39,7 @@
#include <limits>
#include <memory>
#include <string>
+#include <limits>
#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 -rupN --no-dereference gdal-3.2.1-fedora/third_party/LercLib/Lerc2.h gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h
--- gdal-3.2.1-fedora/third_party/LercLib/Lerc2.h 2020-12-29 13:20:02.000000000 +0100
+++ gdal-3.2.1-fedora-new/third_party/LercLib/Lerc2.h 2021-01-04 21:49:36.914247237 +0100
@@ -30,6 +30,7 @@ Contributors: Thomas Maurer
#include <limits>
#include <string>
#include <typeinfo>
+#include <limits>
#include "Defines.h"
#include "BitMask.h"
#include "BitStuffer2.h"

1452
gdal.spec
View File

File diff suppressed because it is too large Load Diff

21
gdal_incompatible-pointer-types.patch Normal file
View File

@ -0,0 +1,21 @@
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
- int nResult = _wstat64(pwszFilename, pStatBuf);
+ int nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(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<struct _stat64 *>(pStatBuf));
}
}

11
gdal_installapps.patch
View File

@ -1,11 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/apps/GNUmakefile gdal-3.2.1-fedora-new/apps/GNUmakefile
--- gdal-3.2.1-fedora/apps/GNUmakefile 2020-12-29 13:15:46.000000000 +0100
+++ gdal-3.2.1-fedora-new/apps/GNUmakefile 2021-01-04 21:49:36.444247832 +0100
@@ -233,6 +233,7 @@ gdal-config-inst: gdal-config.in ../GDAL
install: default
for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
+ for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config

13
gdal_iso8211.patch
View File

@ -1,13 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile
--- gdal-3.2.1-fedora/frmts/iso8211/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/frmts/iso8211/GNUmakefile 2021-01-04 21:49:35.992248405 +0100
@@ -23,8 +23,7 @@ dist-clean: clean
rm -rf $(DISTDIR)
$(ISOLIB): $(OBJ:.o=.$(OBJ_EXT))
- $(AR) r $(ISOLIB) $?
- $(RANLIB) $(ISOLIB)
+ $(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
8211createfromxml$(EXE): 8211createfromxml.$(OBJ_EXT)
$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)

12
gdal_no-diag-disable.patch
View File

@ -1,12 +0,0 @@
diff -rupN gdal-3.2.1-fedora/configure.ac gdal-3.2.1-fedora-new/configure.ac
--- gdal-3.2.1-fedora/configure.ac 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/configure.ac 2021-01-27 13:32:20.815040243 +0100
@@ -61,7 +61,7 @@ dnl warning #2304: non-explicit construc
dnl warning #3280: declaration hides member
dnl remark #11074: Inlining inhibited by limit max-size
dnl remark #11076: To get full report use -qopt-report=4 -qopt-report-phase ipo
-AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
+#AX_CHECK_COMPILE_FLAG([-diag-disable 188,1684,2259,2304,3280,11074,11076],[C_WFLAGS="$C_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076" CXX_WFLAGS="$CXX_WFLAGS -diag-disable 188,1684,2259,2304,3280,11074,11076"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Wextra],[C_WFLAGS="$C_WFLAGS -Wextra" CXX_WFLAGS="$CXX_WFLAGS -Wextra"],,[$ERROR_ON_UNKNOWN_OPTIONS])
AX_CHECK_COMPILE_FLAG([-Winit-self],[C_WFLAGS="$C_WFLAGS -Winit-self" CXX_WFLAGS="$CXX_WFLAGS -Winit-self"],,[$ERROR_ON_UNKNOWN_OPTIONS])

12
gdal_nopdf.patch
View File

@ -1,12 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/doc/source/index.rst gdal-3.2.1-fedora-new/doc/source/index.rst
--- gdal-3.2.1-fedora/doc/source/index.rst 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/doc/source/index.rst 2021-01-04 21:49:36.681247532 +0100
@@ -4,8 +4,6 @@ GDAL
.. include:: ./about_no_title.rst
-This documentation is also available as a `PDF file <gdal.pdf>`_.
-
.. toctree::
:maxdepth: 2

12
gdal_sphinx.patch
View File

@ -1,12 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/doc/Makefile gdal-3.2.1-fedora-new/doc/Makefile
--- gdal-3.2.1-fedora/doc/Makefile 2020-12-29 13:15:46.000000000 +0100
+++ gdal-3.2.1-fedora-new/doc/Makefile 2021-01-04 21:49:36.218248119 +0100
@@ -2,7 +2,7 @@
#
# You can set these variables from the command line.
-SPHINXOPTS = --keep-going -j auto -W
+SPHINXOPTS = --keep-going
SPHINXBUILD = sphinx-build
SOURCEDIR = source
BUILDDIR = build

24
gdal_tirpcinc.patch
View File

@ -1,24 +0,0 @@
diff -rupN --no-dereference gdal-3.2.1-fedora/frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile
--- gdal-3.2.1-fedora/frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
OBJ = dodsdataset2.o
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC)
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
default: $(OBJ:.o=.$(OBJ_EXT))
diff -rupN --no-dereference gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
--- gdal-3.2.1-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-12-29 13:15:47.000000000 +0100
+++ gdal-3.2.1-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2021-01-04 21:49:35.758248701 +0100
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
default: $(O_OBJ:.o=.$(OBJ_EXT))

37
gdal_utils.patch Normal file
View File

@ -0,0 +1,37 @@
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)
# Because linking an OBJECT library
-add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp)
+add_executable(8211dump 8211dump.cpp)
target_include_directories(8211dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp)
+add_executable(8211view 8211view.cpp)
target_include_directories(8211view PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211view PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp)
+add_executable(8211createfromxml 8211createfromxml.cpp)
target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff -rupN --no-dereference gdal-3.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}")
-add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
+add_executable(s57dump s57dump.cpp)
gdal_standard_includes(s57dump)
target_include_directories(s57dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(s57dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> ogr_S57 gdal_iso8211)
+install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.2.1-fedora.tar.xz) = bdc0f25c0bec5f9de48ae3ba53c75e2b19da39338d35dcb714948dded4cc5df9f9b951687d8b40205a37f83fbeb20d65d3fd2bcb60e4a5000a115487a01775b2
SHA512 (gdalautotest-3.2.1.tar.gz) = 2cfa364b596bda8e0609fd31da8802f662ef0a3da09ba3a1e9444a855d2271a0d9f2191f4352aae5919d747f355a0573509f8ee5e117aa65bc605eb10d4d2ed8
SHA512 (gdal-3.10.3-fedora.tar.xz) = 1dced4c7a62ce74323e26d859b4fe82b67f660ab65c2a44f8de35771b7d9dca73b2d1d8c0497588b686bd3b5ea05045caa9558e19618e4c2b2bea3bf03781483
SHA512 (gdalautotest-3.10.3.tar.gz) = af8637944498adfbc33b26f747bab0ad6b46216c58a994248ad8e252c90c6050709bef1b0c15986edfb6a87ee7d09bac8fd837266b5deb8980409bb018037c60