From c3e4ee187ef334a67bb59382900f938d7ce37c1f Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Mon, 9 Jun 2025 14:55:01 +0200 Subject: [PATCH] Sync with fedora to make package up to date Resolves: RHEL-81596 --- .gitignore | 55 + cpl-config.h | 11 + gating.yaml | 7 + gdal-1.9.0-java.patch | 11 - gdal-3.10.2-integer-types.patch | 11 + gdal-cleaner.sh | 21 +- gdal-config | 11 + gdal-gcc11.patch | 33 - gdal.spec | 1452 +++++++++++++++++-------- gdal_incompatible-pointer-types.patch | 21 + gdal_installapps.patch | 11 - gdal_iso8211.patch | 13 - gdal_no-diag-disable.patch | 12 - gdal_nopdf.patch | 12 - gdal_sphinx.patch | 12 - gdal_tirpcinc.patch | 24 - gdal_utils.patch | 37 + sources | 4 +- 18 files changed, 1144 insertions(+), 614 deletions(-) create mode 100644 cpl-config.h create mode 100644 gating.yaml delete mode 100644 gdal-1.9.0-java.patch create mode 100644 gdal-3.10.2-integer-types.patch create mode 100755 gdal-config delete mode 100644 gdal-gcc11.patch create mode 100644 gdal_incompatible-pointer-types.patch delete mode 100644 gdal_installapps.patch delete mode 100644 gdal_iso8211.patch delete mode 100644 gdal_no-diag-disable.patch delete mode 100644 gdal_nopdf.patch delete mode 100644 gdal_sphinx.patch delete mode 100644 gdal_tirpcinc.patch create mode 100644 gdal_utils.patch diff --git a/.gitignore b/.gitignore index b120142..6e49fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/cpl-config.h b/cpl-config.h new file mode 100644 index 0000000..456693f --- /dev/null +++ b/cpl-config.h @@ -0,0 +1,11 @@ +#include + +#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 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..2ed4470 --- /dev/null +++ b/gating.yaml @@ -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} diff --git a/gdal-1.9.0-java.patch b/gdal-1.9.0-java.patch deleted file mode 100644 index 48c09f2..0000000 --- a/gdal-1.9.0-java.patch +++ /dev/null @@ -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 - - diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch new file mode 100644 index 0000000..dfad44c --- /dev/null +++ b/gdal-3.10.2-integer-types.patch @@ -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 + #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 393ee2e..db17622 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -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 diff --git a/gdal-config b/gdal-config new file mode 100755 index 0000000..0a258a7 --- /dev/null +++ b/gdal-config @@ -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 diff --git a/gdal-gcc11.patch b/gdal-gcc11.patch deleted file mode 100644 index 9e33d56..0000000 --- a/gdal-gcc11.patch +++ /dev/null @@ -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 - #include - #include -+#include - - //------------------------------------------------------------------------------ - // 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 - #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 -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 - #include - #include -+#include - #include "Defines.h" - #include "BitMask.h" - #include "BitStuffer2.h" diff --git a/gdal.spec b/gdal.spec index 3d02462..7ea847c 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,18 +1,15 @@ -#TODO: msg needs to have PublicDecompWT.zip from EUMETSAT, which is not free; -# Building without msg therefore -#TODO: e00compr bundled? -#TODO: There are tests for bindings -- at least for Perl -#TODO: Java has a directory with test data and a build target called test -# It uses %%{JAVA_RUN}; make test seems to work in the build directory -#TODO: e00compr source is the same in the package and bundled in GDAL -#TODO: Consider doxy patch from Suse, setting EXTRACT_LOCAL_CLASSES = NO - -# Tests can be of a different version -%global testversion 3.2.1 %global run_tests 1 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) +# We have multilib triage +%if "%{_lib}" == "lib" + %global cpuarch 32 +%else + %global cpuarch 64 +%endif + + %if 0%{?bootstrap} %global with_mysql 0 %global mysql --without-mysql @@ -31,153 +28,220 @@ %global spatialite "--with-spatialite" %endif -%bcond_with python2 +%if 0%{?fedora} +%bcond_without mingw %bcond_without python3 +%ifarch %{java_arches} +%bcond_without java +%else +%bcond_with java +%endif +%else +%bcond_with mingw +%bcond_with python3 +%bcond_with java +%endif + +#global pre rc1 -# No ppc64 build for spatialite in EL6 -# https://bugzilla.redhat.com/show_bug.cgi?id=663938 -%if 0%{?rhel} == 6 -%ifnarch ppc64 -%global with_spatialite 0 -%global spatialite --without-spatialite -%endif -%endif Name: gdal -Version: 3.2.1 -Release: 5%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Version: 3.10.3 +Release: 3%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org # Source0: http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz # See PROVENANCE.TXT-fedora and the cleaner script for details! -Source0: %{name}-%{version}-fedora.tar.xz -Source1: http://download.osgeo.org/%{name}/%{testversion}/%{name}autotest-%{testversion}.tar.gz - -# Cleaner script for the tarball -Source3: %{name}-cleaner.sh - +Source0: %{name}-%{version}%{?pre:%pre}-fedora.tar.xz +Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.tar.gz +# Multilib compatible cpl-config.h header +Source2: cpl-config.h +# Multilib compatible gdal-config script +Source3: gdal-config Source4: PROVENANCE.TXT-fedora -# Fedora uses Alternatives for Java -Patch2: %{name}-1.9.0-java.patch -# Ensure rpc/types.h is found by dods driver (indirectly required by libdap/XDRUtils.h) -Patch3: gdal_tirpcinc.patch -# Use libtool to create libiso8211.a, otherwise broken static lib is created since object files are compiled through libtool -Patch4: gdal_iso8211.patch -# Don't pass -W to sphinx, it causes it to error out on warnings -# Don't do parallel build, currently fails with "Sphinx parallel build error: NotImplementedError" -Patch5: gdal_sphinx.patch -# Fix makefiles installing libtool wrappers instead of actual executables -Patch6: gdal_installapps.patch -# Don't refer to PDF manual which is not built -Patch7: gdal_nopdf.patch -# Fix issues caught by gcc-11 -Patch8: %{name}-gcc11.patch -# Drop -diag-disable compile flag -Patch9: gdal_no-diag-disable.patch +# Cleaner script for the tarball +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 -BuildRequires: gcc +BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: automake -BuildRequires: autoconf -BuildRequires: ant -BuildRequires: armadillo-devel -BuildRequires: bash-completion -BuildRequires: cfitsio-devel -#BuildRequires: CharLS-devel -BuildRequires: chrpath + +BuildRequires: bison BuildRequires: curl-devel -BuildRequires: doxygen BuildRequires: expat-devel -BuildRequires: fontconfig-devel -BuildRequires: freexl-devel -BuildRequires: geos-devel >= 3.7.1 -BuildRequires: ghostscript -BuildRequires: hdf-devel -BuildRequires: hdf-static -BuildRequires: hdf5-devel -# No complete java yet in EL8 -%if 0%{?rhel} < 8 -BuildRequires: java-devel >= 1:1.6.0 -%endif -BuildRequires: jasper-devel -BuildRequires: jpackage-utils -# No complete java yet in EL8 -%if 0%{?rhel} < 8 -# For 'mvn_artifact' and 'mvn_install' -BuildRequires: javapackages-local -%endif +BuildRequires: geos-devel BuildRequires: json-c-devel -BuildRequires: libgeotiff-devel -BuildRequires: libgta-devel - -BuildRequires: libjpeg-devel +BuildRequires: libarchive-devel BuildRequires: libpng-devel -BuildRequires: libkml-devel - -%if %{with_spatialite} -BuildRequires: libspatialite-devel -%endif - -BuildRequires: libtiff-devel -BuildRequires: libwebp-devel -BuildRequires: libtool -BuildRequires: giflib-devel -BuildRequires: netcdf-devel -BuildRequires: libdap-devel -BuildRequires: librx-devel -%if 0%{?with_mysql} -BuildRequires: mariadb-connector-c-devel -%endif -BuildRequires: pcre-devel -BuildRequires: ogdi-devel -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: openjpeg2-devel -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: %{_bindir}/pkg-config -%if 0%{?with_poppler} -BuildRequires: poppler-devel -%endif 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 -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-numpy -%endif -%if %{with python3} -BuildRequires: python3-devel -BuildRequires: python3-numpy -BuildRequires: python3-setuptools -%endif BuildRequires: sqlite-devel BuildRequires: swig BuildRequires: unixODBC-devel -BuildRequires: xerces-c-devel BuildRequires: xz-devel BuildRequires: zlib-devel -BuildRequires: libtirpc-devel -BuildRequires: python3-sphinx -BuildRequires: python3-sphinx_rtd_theme -BuildRequires: python3-breathe -BuildRequires: make +%if 0%{?fedora} +# Fedora dependencies +BuildRequires: armadillo-devel +BuildRequires: blosc-devel +BuildRequires: cfitsio-devel +BuildRequires: CharLS-devel +BuildRequires: freexl-devel +BuildRequires: giflib-devel +BuildRequires: gtest-devel +BuildRequires: hdf-devel +BuildRequires: hdf5-devel +%ifnarch %{ix86} %{arm} +BuildRequires: libarrow-devel +BuildRequires: libarrow-dataset-devel +%endif +BuildRequires: libdap-devel +BuildRequires: libdeflate-devel +BuildRequires: libgeotiff-devel +BuildRequires: libgta-devel +BuildRequires: libjpeg-devel +BuildRequires: libkml-devel +BuildRequires: liblerc-devel +%if %{with_spatialite} +BuildRequires: libspatialite-devel +%endif +BuildRequires: libwebp-devel +BuildRequires: libzstd-devel +%if 0%{?with_mysql} +BuildRequires: mariadb-connector-c-devel +%endif +BuildRequires: netcdf-devel +BuildRequires: ogdi-devel +BuildRequires: openexr-devel +BuildRequires: openssl-devel-engine +%ifnarch %{ix86} %{arm} +BuildRequires: parquet-libs-devel +%endif +%if 0%{?with_poppler} +BuildRequires: poppler-devel +%endif +BuildRequires: qhull-devel +BuildRequires: xerces-c-devel +%else +# RHEL dependencies +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel +%endif -# Run time dependency for gpsbabel driver +# 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 +%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 + +# MinGW +%if %{with mingw} +BuildRequires: mingw32-filesystem +BuildRequires: mingw32-gcc-c++ +BuildRequires: mingw32-cfitsio +BuildRequires: mingw32-curl +BuildRequires: mingw32-dlfcn +BuildRequires: mingw32-expat +BuildRequires: mingw32-freexl +BuildRequires: mingw32-geos +BuildRequires: mingw32-giflib +BuildRequires: mingw32-libarchive +BuildRequires: mingw32-libgeotiff +BuildRequires: mingw32-libgta +BuildRequires: mingw32-libjpeg-turbo +BuildRequires: mingw32-libkml +BuildRequires: mingw32-liblerc +BuildRequires: mingw32-libpng +BuildRequires: mingw32-libspatialite +BuildRequires: mingw32-libtiff +BuildRequires: mingw32-libwebp +BuildRequires: mingw32-openexr +BuildRequires: mingw32-openjpeg2 +BuildRequires: mingw32-pcre2 +BuildRequires: mingw32-poppler +BuildRequires: mingw32-postgresql +BuildRequires: mingw32-proj +BuildRequires: mingw32-sqlite +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 +BuildRequires: mingw64-gcc-c++ +BuildRequires: mingw64-cfitsio +BuildRequires: mingw64-curl +BuildRequires: mingw64-dlfcn +BuildRequires: mingw64-expat +BuildRequires: mingw64-freexl +BuildRequires: mingw64-geos +BuildRequires: mingw64-giflib +BuildRequires: mingw64-libarchive +BuildRequires: mingw64-libgeotiff +BuildRequires: mingw64-libgta +BuildRequires: mingw64-libjpeg-turbo +BuildRequires: mingw64-libkml +BuildRequires: mingw64-liblerc +BuildRequires: mingw64-libpng +BuildRequires: mingw64-libspatialite +BuildRequires: mingw64-libtiff +BuildRequires: mingw64-libwebp +BuildRequires: mingw64-openexr +BuildRequires: mingw64-openjpeg2 +BuildRequires: mingw64-pcre2 +BuildRequires: mingw64-poppler +BuildRequires: mingw64-postgresql +BuildRequires: mingw64-proj +BuildRequires: mingw64-sqlite +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} -# We have multilib triage -%if "%{_lib}" == "lib" - %global cpuarch 32 -%else - %global cpuarch 64 -%endif %description Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform @@ -208,8 +272,7 @@ Provides: bundled(degrib) = 2.14 This package contains the GDAL file format library. -# No complete java yet in EL8 -%if 0%{?rhel} < 8 +%if %{with java} %package java Summary: Java modules for the GDAL file format library Requires: jpackage-utils @@ -229,77 +292,93 @@ This package contains the API documentation for %{name}. %endif -%package perl -Summary: Perl modules for the GDAL file format library -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - -%description perl -The GDAL Perl modules provide support to handle multiple GIS file formats. - - -%if %{with python2} -%package -n python2-gdal -%{?python_provide:%python_provide python2-gdal} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python modules for the GDAL file format library -Requires: numpy -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description -n python2-gdal -The GDAL Python modules provide support to handle multiple GIS file formats. -The package also includes a couple of useful utilities in Python. -%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} -Obsoletes: gdal-python3 < 2.3.1 -Provides: gdal-python3 = %version-%release %description -n python3-gdal The GDAL Python 3 modules provide support to handle multiple GIS file formats. -%endif -%if %{with python2} || %{with python3} %package python-tools Summary: Python tools for the GDAL file format library -Requires: %{?with_python3:python3-gdal}%{?!with_python3:python2-gdal} +Requires: python3-gdal %description python-tools The GDAL Python package provides number of tools for programming and manipulating GDAL file format library -%endif - - -%package doc -Summary: Documentation for GDAL -BuildArch: noarch - -%description doc -This package contains documentation for GDAL. - # We don't want to provide private Python extension libs -%if %{with python2} && %{with python3} -%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\.so$ -%elif %{with python2} -%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$ -%elif %{with_python3} %global __provides_exclude_from ^%{python3_sitearch}/.*\.so$ %endif +%if %{with mingw} +%package -n mingw32-%{name} +Summary: MinGW Windows GDAL library +# GDAL bundles a modified copy of g2clib and degrib +# See frmts/grib/degrib/README.TXT +Provides: bundled(g2lib) = 1.6.0 +Provides: bundled(degrib) = 2.14 +BuildArch: noarch + +%description -n mingw32-%{name} +MinGW Windows GDAL library. + + +%package -n mingw32-%{name}-tools +Summary: MinGW Windows GDAL library tools +BuildArch: noarch + +%description -n mingw32-%{name}-tools +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 +# See frmts/grib/degrib/README.TXT +Provides: bundled(g2lib) = 1.6.0 +Provides: bundled(degrib) = 2.14 +BuildArch: noarch + +%description -n mingw64-%{name} +MinGW Windows GDAL library. + + +%package -n mingw64-%{name}-tools +Summary: MinGW Windows GDAL library tools +BuildArch: noarch + +%description -n mingw64-%{name}-tools +MinGW Windows GDAL library tools. + + +%if %{with python3} +%package -n mingw64-python3-%{name} +Summary: MinGW Windows Python3 GDAL bindings + +%description -n mingw64-python3-%{name} +MinGW Windows Python3 GDAL bindings. +%endif + +%{?mingw_debug_package} +%endif + %prep -%autosetup -p1 -n %{name}-%{version}-fedora -a 1 +%autosetup -N -p1 -n %{name}-%{version}-fedora # Delete bundled libraries rm -rf frmts/zlib @@ -309,366 +388,785 @@ rm -rf frmts/jpeg/libjpeg rm -rf frmts/jpeg/libjpeg12 rm -rf frmts/gtiff/libgeotiff 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 + +# Need to patch autotest +%autopatch -p1 # Copy in PROVENANCE.TXT-fedora -cp -p %SOURCE4 . - -# Adjust check for LibDAP version -# http://trac.osgeo.org/gdal/ticket/4545 -%if %cpuarch == 64 - sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure.ac -%endif +cp -a %{SOURCE4} . %build -# For future reference: -# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024 -# Building without pgeo driver, because it drags in Java -autoreconf -ifv - -%configure \ - --with-autoload=%{_libdir}/%{name}plugins \ - --includedir=%{_includedir}/%{name}/ \ - --prefix=%{_prefix} \ - --with-bash-completion \ - --with-armadillo \ - --with-curl \ - --with-cfitsio \ - --with-dods-root=%{_prefix} \ - --with-expat \ - --with-freexl \ - --with-geos \ - --with-geotiff \ - --with-gif \ - --with-gta \ - --with-hdf4 \ - --with-hdf5 \ - --with-jasper \ -%if 0%{?rhel} < 8 - --with-java \ +%cmake \ + -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ +%if %{with java} + -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ + -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ %endif - --with-jpeg \ - --with-libjson-c \ - --without-jpeg12 \ - --with-liblzma \ - --with-libtiff \ - --with-libz \ - --without-mdb \ - --without-msg \ - %{mysql} \ - --with-netcdf \ - --with-odbc \ - --with-ogdi \ - --with-openjpeg \ - --with-pcraster \ - --with-pg \ - --with-png \ - %{poppler} \ - --with-proj \ - %{spatialite} \ - --with-sqlite3 \ - --with-threads \ - --with-webp \ - --with-xerces \ - --enable-shared \ - --with-libkml - -%make_build - -# Build some utilities, as requested in BZ #1271906 -make -C ogr/ogrsf_frmts/s57 all -make -C frmts/iso8211 all - -# Documentation -make man -make docs - -# No complete java yet in EL8 -%if 0%{?rhel} < 8 - -# Make Java module and documentation -pushd swig/java - make - ant maven -popd -%mvn_artifact swig/java/build/maven/gdal-%version.pom swig/java/build/maven/gdal-%version.jar +%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 -# Make Python modules -pushd swig/python - %{?with_python2:%py2_build} - %{?with_python3:%py3_build} -popd - -# Make Perl modules -pushd swig/perl - perl Makefile.PL INSTALLDIRS=vendor - %make_build -popd +%if %{with mingw} +%mingw_cmake \ + -DBUILD_TESTING=OFF \ + -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DENABLE_DEFLATE64=OFF +%mingw_make_build +%endif %install -pushd swig/python - %{?with_python2:%py2_install} - %{?with_python3:%py3_install} -popd +%cmake_install -%make_install -C swig/perl - -%make_install install-man - -# Drop gdal.pdf symlink, as we don't build the pdf documentation -rm doc/build/html/gdal.pdf - -install -pm 755 ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir} -install -pm 755 frmts/iso8211/8211createfromxml %{buildroot}%{_bindir} -install -pm 755 frmts/iso8211/8211dump %{buildroot}%{_bindir} -install -pm 755 frmts/iso8211/8211view %{buildroot}%{_bindir} -# Rename for %%files doc below -mv frmts/iso8211/html frmts/iso8211/iso8211_html - -# Directory for auto-loading plugins -mkdir -p %{buildroot}%{_libdir}/%{name}plugins - -#TODO: Don't do that? -rm %{buildroot}%{perl_archlib}/perllocal.pod - -%if %{without python} && %{without python3} -rm %buildroot%_mandir/man1/{pct2rgb,rgb2pct}.1 +%if %{with mingw} +%mingw_make_install +# Delete data from cross packages +rm -r %{buildroot}%{mingw32_datadir} +rm -r %{buildroot}%{mingw64_datadir} %endif -# Correct permissions -#TODO and potential ticket: Why are the permissions not correct? -find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \; -find %{buildroot}%{perl_vendorarch} -name "*.pm" -exec chmod 644 '{}' \; - -# No complete java yet in EL8 -%if 0%{?rhel} < 8 -# install Java plugin -%mvn_install -J swig/java/java - -# 775 on the .so? -# copy JNI libraries and links, non versioned link needed by JNI -# What is linked here? -mkdir -p %{buildroot}%{_jnidir}/%{name} -cp -pl swig/java/.libs/*.so* \ - %{buildroot}%{_jnidir}/%{name}/ -chrpath --delete %{buildroot}%{_jnidir}/%{name}/*jni.so* - -# Install Java API documentation in the designated place -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -pr swig/java/java/org %{buildroot}%{_javadocdir}/%{name} -%endif - -#TODO: Header date lost during installation -# Install multilib cpl_config.h bz#430894 -install -p -D -m 644 port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h -# Create universal multilib cpl_config.h bz#341231 -# The problem is still there in 1.9. -#TODO: Ticket? - -#>>>>>>>>>>>>> -cat > %{buildroot}%{_includedir}/%{name}/cpl_config.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 -EOF -#<<<<<<<<<<<<< -touch -r NEWS port/cpl_config.h - - -# Multilib gdal-config -# Rename the original script to gdal-config-$arch (stores arch-specific information) -# and create a script to call one or the other -- depending on detected architecture -# TODO: The extra script will direct you to 64 bit libs on -# 64 bit systems -- whether you like that or not +# Multilib +# - cpl_config.h is arch-dependent (contains various SIZEOF defines) +# - gdal-config stores arch-specific information +mv %{buildroot}%{_includedir}/%{name}/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h +cp -a %{SOURCE2} %{buildroot}%{_includedir}/%{name}/cpl_config.h mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch} -#>>>>>>>>>>>>> -cat > %{buildroot}%{_bindir}/%{name}-config < - 3.10.3-3 +- Rebuilt for Python 3.14 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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 + +* Wed Nov 20 2024 Sandro Mani - 3.10.0-3 +- Drop fedora conditional for gpsbabel requires + +* Tue Nov 19 2024 Sandro Mani - 3.10.0-2 +- Require gpsbabel only on Fedora + +* Wed Nov 06 2024 Sandro Mani - 3.10.0-1 +- Update to 3.10.0 + +* Fri Oct 25 2024 Orion Poplawski - 3.9.3-5 +- Rebuild for hdf5 1.14.5 + +* Tue Oct 22 2024 Sandro Mani - 3.9.3-4 +- Rebuild (mingw-xerces-c) + +* Mon Oct 21 2024 Pete Walter - 3.9.3-3 +- Rebuild for xerces-c 3.3 + +* Fri Oct 18 2024 Pete Walter - 3.9.3-2 +- Rebuild for xerces-c 3.3 + +* Tue Oct 15 2024 Sandro Mani - 3.9.3-1 +- Update to 3.9.3 + +* Mon Sep 16 2024 Sandro Mani - 3.9.2-4 +- Rebuild (proj) + +* Fri Aug 23 2024 Sandro Mani - 3.9.2-3 +- Rebuild (mingw-poppler) + +* Thu Aug 22 2024 Marek Kasik - 3.9.2-2 +- Rebuild for poppler 24.08.0 + +* Sat Aug 17 2024 Sandro Mani - 3.9.2-1 +- Update to 3.9.2 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 26 2024 Sandro Mani - 3.9.1-1 +- Update to 3.9.1 + +* Sun Jun 09 2024 Python Maint - 3.9.0-4 +- Rebuilt for Python 3.13 + +* Wed May 15 2024 Sandro Mani - 3.9.0-3 +- Rebuild (libarrow) + +* Tue May 14 2024 Sandro Mani - 3.9.0-2 +- BR: libarrow-dataset-devel + +* Sat May 11 2024 Sandro Mani - 3.9.0-1 +- Update to 3.9.0 + +* Wed Apr 24 2024 Benjamin A. Beasley - 3.8.5-4 +- Rebuilt for openexr 3.2.4 + +* Tue Apr 23 2024 Sandro Mani - 3.8.5-3 +- Rebuild (libarrow) + +* Sun Apr 14 2024 Sandro Mani - 3.8.5-2 +- BR: parquet-libs-devel + +* Mon Apr 08 2024 Sandro Mani - 3.8.5-1 +- Update to 3.8.5 + +* Thu Mar 21 2024 Sandro Mani - 3.8.4-5 +- Rebuild (libarrow) + +* Tue Mar 19 2024 Sandro Mani - 3.8.4-4 +- Rebuild (libarrow) + +* Tue Mar 05 2024 Sandro Mani - 3.8.4-3 +- Rebuild (proj) + +* Mon Feb 26 2024 Sandro Mani - 3.8.4-2 +- BR: libarchive + +* Sun Feb 18 2024 Sandro Mani - 3.8.4-1 +- Update to 3.8.4 + +* Fri Feb 02 2024 Sandro Mani - 3.8.3-5 +- Rebuild (poppler) + +* Sat Jan 27 2024 Sandro Mani - 3.8.3-4 +- Enable libarrow, libdeflate + +* Wed Jan 24 2024 Fedora Release Engineering - 3.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 08 2024 Sandro Mani - 3.8.3-1 +- Update to 3.8.3 + +* Thu Dec 21 2023 Sandro Mani - 3.8.2-2 +- Rebuild (armadillo) + +* Wed Dec 20 2023 Sandro Mani - 3.8.2-1 +- Update to 3.8.2 + +* Wed Dec 20 2023 Sandro Mani - 3.8.1-2 +- Rebuild (armadillo) + +* Thu Nov 30 2023 Sandro Mani - 3.8.1-1 +- Update to 3.8.1 + +* Tue Nov 14 2023 Sandro Mani - 3.8.0-1 +- Update to 3.8.0 + +* Fri Nov 03 2023 Sandro Mani - 3.7.3-1 +- Update to 3.7.3 + +* Wed Sep 13 2023 Sandro Mani - 3.7.2-1 +- Update to 3.7.2 + +* Sun Sep 03 2023 Sandro Mani - 3.7.1-7 +- Rebuild (proj) + +* Tue Aug 15 2023 Sandro Mani - 3.7.1-6 +- Rebuild (libspatialite) + +* Mon Aug 14 2023 Sandro Mani - 3.7.1-5 +- Rebuild (mingw-poppler) + +* Wed Aug 9 2023 Tom Callaway - 3.7.1-4 +- rebuild for new qhull + +* Mon Aug 07 2023 Marek Kasik - 3.7.1-3 +- Rebuild for poppler 23.08.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 18 2023 Sandro Mani - 3.7.1-1 +- Update to 3.7.1 + +* Mon Jul 03 2023 Python Maint - 3.7.0-2 +- Rebuilt for Python 3.12 + +* Thu May 11 2023 Sandro Mani - 3.7.0-1 +- Update to 3.7.0 + +* Tue May 09 2023 Markus Neteler - 3.6.4-3 +- SPDX migration + +* Tue May 02 2023 Sandro Mani - 3.6.4-2 +- Drop unused librx BR + +* Sat Apr 22 2023 Sandro Mani - 3.6.4-1 +- Update to 3.6.4 + +* Tue Mar 14 2023 Sandro Mani - 3.6.3-1 +- Update to 3.6.3 + +* Sat Mar 04 2023 Sandro Mani - 3.6.2-6 +- Rebuild (proj) + +* Tue Feb 07 2023 Sandro Mani - 3.6.2-5 +- Rebuild (mingw-poppler) + +* Sat Feb 04 2023 Sandro Mani - 3.6.2-4 +- Rebuild (poppler) + +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Maxwell G - 3.6.2-2 +- Rebuild for cfitsio 4.2 + +* Thu Jan 05 2023 Sandro Mani - 3.6.2-1 +- Update to 3.6.2 + +* Mon Jan 02 2023 Sandro Mani - 3.6.1-3 +- Rebuild (mingw-cfitsio) + +* Thu Dec 29 2022 Maxwell G - 3.6.1-2 +- Rebuild for cfitsio 4.2 + +* Thu Dec 15 2022 Sandro Mani - 3.6.1-1 +- Update to 3.6.1 + +* Mon Dec 05 2022 Sandro Mani - 3.6.0-4 +- Rebuild (mingw-xerces-c) + +* Mon Dec 05 2022 Sandro Mani - 3.6.0-3 +- Switch to pcre2 for mingw build + +* Fri Nov 18 2022 Sandro Mani - 3.6.0-2 +- Rebuild (mingw-postgresql) + +* Fri Nov 11 2022 Sandro Mani - 3.6.0-1 +- Update to 3.6.0 + +* Thu Nov 03 2022 Sandro Mani - 3.6.0-0.1.rc1 +- Update to 3.6.0-rc1 + +* Thu Nov 03 2022 Sandro Mani - 3.5.3-2 +- Re-enable java + +* Tue Nov 01 2022 Sandro Mani - 3.5.3-1 +- Update to 3.5.3 + +* Wed Oct 19 2022 Sandro Mani - 3.5.2-3 +- Rebuild (python-3.11) + +* Fri Oct 7 2022 Tom Rix - 3.5.2-2 +- Add mingw build conditional +- Reduce java build condition to rhel 8 + +* Tue Sep 13 2022 Sandro Mani - 3.5.2-1 +- Update to 3.5.2 + +* Sun Sep 04 2022 Sandro Mani - 3.5.1-6 +- Rebuild (proj) + +* Tue Aug 02 2022 Sandro Mani - 3.5.1-5 +- Rebuild (poppler) + +* Wed Jul 27 2022 Sandro Mani - 3.5.1-4 +- Rebuild (liblerc) + +* Thu Jul 21 2022 Sandro Mani - 3.5.1-3 +- Rebuild (liblerc) + +* Thu Jul 21 2022 Fedora Release Engineering - 3.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 06 2022 Sandro Mani - 3.5.1-1 +- Update to 3.5.1 +- Limit -java subpackage to %%java_arches + +* Mon Jun 13 2022 Python Maint - 3.5.0-5 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Jitka Plesnikova - 3.5.0-4 +- Perl 5.36 rebuild + +* Sat May 21 2022 Sandro Mani - 3.5.0-3 +- Fix gdal-config take two + +* Fri May 20 2022 Sandro Mani - 3.5.0-2 +- Fix gdal-config + +* Fri May 13 2022 Sandro Mani - 3.5.0-1 +- Update to 3.5.0 + +* Wed May 04 2022 Sandro Mani - 3.4.3-1 +- Update to 3.4.3 + +* Mon Mar 14 2022 Sandro Mani - 3.4.2-1 +- Update to 3.4.2 + +* Thu Mar 10 2022 Sandro Mani - 3.4.1-6 +- Rebuild for proj-9.0.0 + +* Sun Feb 13 2022 Josef Ridky - 3.4.1-5 +- Rebuilt for libjasper.so.6 + +* Sat Feb 05 2022 Jiri Vanek - 3.4.1-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jan 13 2022 Sandro Mani - 3.4.1-2 +- Rebuild (poppler) + +* Tue Jan 04 2022 Sandro Mani - 3.4.1-1 +- Update to 3.4.1 + +* Sun Nov 21 2021 Orion Poplawski - 3.4.0-2 +- Rebuild for hdf5 1.12.1 + +* Mon Nov 08 2021 Sandro Mani - 3.4.0-1 +- Update to 3.4.0 + +* Fri Oct 29 2021 Sandro Mani - 3.3.3-1 +- Update to 3.3.3 + +* Thu Oct 21 2021 Sandro Mani - 3.3.2-3 +- Rebuild (geos) + +* Tue Sep 14 2021 Sahana Prasad - 3.3.2-2 +- Rebuilt with OpenSSL 3.0.0 + +* Tue Sep 07 2021 Sandro Mani - 3.3.2-1 +- Update to 3.3.2 + +* Tue Aug 10 2021 Orion Poplawski - 3.3.1-5 +- Rebuild for hdf5 1.10.7/netcdf 4.8.0 + +* Mon Aug 02 2021 Sandro Mani - 3.3.1-4 +- Rebuild (poppler) + +* Wed Jul 21 2021 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 10 2021 Björn Esser - 3.3.1-2 +- Rebuild for versioned symbols in json-c + +* Mon Jul 05 2021 Sandro Mani - 3.3.1-1 +- Update to 3.3.1 + +* Fri Jun 04 2021 Python Maint - 3.3.0-7 +- Rebuilt for Python 3.10 + +* Mon May 24 2021 Jitka Plesnikova - 3.3.0-6 +- Perl 5.34 re-rebuild updated packages + +* Fri May 21 2021 Sandro Mani - 3.3.0-5 +- Rebuild (libgta) + +* Fri May 21 2021 Jitka Plesnikova - 3.3.0-4 +- Perl 5.34 rebuild + +* Thu May 20 2021 Richard Shaw - 3.3.0-3 +- Rebuilding for libgta 1.2.1. + +* Fri May 07 2021 Sandro Mani - 3.3.0-2 +- Rebuild (gdal) + +* Mon May 03 2021 Sandro Mani - 3.3.0-1 +- Update to 3.3.0 + +* Wed Mar 24 2021 Sandro Mani - 3.2.2-1 +- Update to 3.2.2 + +* Sun Mar 07 2021 Sandro Mani - 3.2.1-10 +- Rebuild (proj) + +* Tue Feb 23 2021 Elliott Sales de Andrade - 3.2.1-9 +- Fix compile against GEOS on s390x + +* Sat Feb 13 2021 Sandro Mani - 3.2.1-8 +- Rebuild (geos) + +* Sat Feb 13 2021 Sandro Mani - 3.2.1-7 +- Rebuild (geos) + +* Mon Feb 08 2021 Pavel Raiskup - 3.2.1-6 +- rebuild for libpq ABI fix rhbz#1908268 + * Mon Feb 01 2021 Orion Poplawski - 3.2.1-5 - Rebuild for cfitsio 3.490 @@ -1396,7 +1894,7 @@ popd - Added jnis - Patches updated with proper version info - Added suggestions from Ralph Apel - + Versionless symlink for gdal.jar - + Maven2 pom - + JPP-style depmap - + Use -f XX.files for ruby and python + + Versionless symlink for gdal.jar + + Maven2 pom + + JPP-style depmap + + Use -f XX.files for ruby and python diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch new file mode 100644 index 0000000..f70e12e --- /dev/null +++ b/gdal_incompatible-pointer-types.patch @@ -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(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_installapps.patch b/gdal_installapps.patch deleted file mode 100644 index 6633ff2..0000000 --- a/gdal_installapps.patch +++ /dev/null @@ -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 - diff --git a/gdal_iso8211.patch b/gdal_iso8211.patch deleted file mode 100644 index 0c9e975..0000000 --- a/gdal_iso8211.patch +++ /dev/null @@ -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) diff --git a/gdal_no-diag-disable.patch b/gdal_no-diag-disable.patch deleted file mode 100644 index 8eefe7d..0000000 --- a/gdal_no-diag-disable.patch +++ /dev/null @@ -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]) diff --git a/gdal_nopdf.patch b/gdal_nopdf.patch deleted file mode 100644 index b53a5d8..0000000 --- a/gdal_nopdf.patch +++ /dev/null @@ -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 `_. -- - .. toctree:: - :maxdepth: 2 - diff --git a/gdal_sphinx.patch b/gdal_sphinx.patch deleted file mode 100644 index 5e8a38f..0000000 --- a/gdal_sphinx.patch +++ /dev/null @@ -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 diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch deleted file mode 100644 index 3658f56..0000000 --- a/gdal_tirpcinc.patch +++ /dev/null @@ -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)) - diff --git a/gdal_utils.patch b/gdal_utils.patch new file mode 100644 index 0000000..3128eba --- /dev/null +++ b/gdal_utils.patch @@ -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_link_libraries(8211dump PRIVATE $ 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_link_libraries(8211view PRIVATE $ 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_link_libraries(8211createfromxml PRIVATE $ 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_link_libraries(s57dump PRIVATE $ ogr_S57 gdal_iso8211) ++install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sources b/sources index 03e88bb..0ddc2fd 100644 --- a/sources +++ b/sources @@ -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