diff --git a/.gitignore b/.gitignore index 27a57c4..71e0fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,54 @@ gdalautotest-1.7.0.tar.gz /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.8.4-fedora.tar.xz +/gdalautotest-3.8.4.tar.gz +/gdal-3.8.5-fedora.tar.xz +/gdalautotest-3.8.5.tar.gz +/gdal-3.9.0-fedora.tar.xz +/gdalautotest-3.9.0.tar.gz +/gdal-3.9.1-fedora.tar.xz +/gdalautotest-3.9.1.tar.gz +/gdal-3.9.2-fedora.tar.xz +/gdalautotest-3.9.2.tar.gz +/gdalautotest-3.9.3.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 +/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 +/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 +/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 +/gdal-3.12.1-fedora.tar.xz +/gdalautotest-3.12.1.zip diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index db17622..2859e69 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,7 +1,8 @@ #!/bin/bash +set -e if [ $# -lt 1 ]; then - echo "Usage: $0 version" + echo "Usage: $0 version pre" exit 1 fi @@ -18,20 +19,20 @@ if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then fi tar xvf gdal-"${VERSION}${PRE}".tar.xz -mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora +mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora -rm data/cubewerx_extra.wkt -rm data/esri_StatePlane_extra.wkt -rm data/ecw_cs.wkt +rm ogr/data/cubewerx_extra.wkt +rm ogr/data/esri_StatePlane_extra.wkt +rm ogr/data/ecw_cs.wkt -sed -i 's|data/cubewerx_extra.wkt||' gdal.cmake -sed -i 's|data/esri_StatePlane_extra.wkt||' gdal.cmake -sed -i 's|data/ecw_cs.wkt||' gdal.cmake +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt +sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt popd #TODO: Insert Provenance file -tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora +tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora diff --git a/gdal-config b/gdal-config index 37a3f66..0a258a7 100755 --- a/gdal-config +++ b/gdal-config @@ -2,7 +2,7 @@ ARCH=$(uname -m) case $ARCH in -x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 ) +x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 ) gdal-config-64 ${*} ;; *) diff --git a/gdal-fortify-source.patch b/gdal-fortify-source.patch deleted file mode 100644 index 80f8b42..0000000 --- a/gdal-fortify-source.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference gdal-3.5.3-fedora/port/vsipreload.cpp gdal-3.5.3-fedora-new/port/vsipreload.cpp ---- gdal-3.5.3-fedora/port/vsipreload.cpp 2022-10-21 16:57:18.000000000 +0200 -+++ gdal-3.5.3-fedora-new/port/vsipreload.cpp 2023-11-07 11:43:16.562899886 +0100 -@@ -46,6 +46,17 @@ - // LD_PRELOAD=./vsipreload.so ls -al /vsicurl/http://download.osgeo.org/gdal/data/sqlite3 - // LD_PRELOAD=./vsipreload.so find /vsicurl/http://download.osgeo.org/gdal/data/sqlite3 - -+ -+/* -+ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting -+ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we -+ * can define our overrides. -+ */ -+#ifdef _FORTIFY_SOURCE -+#undef _FORTIFY_SOURCE -+#endif -+ -+ - #define _GNU_SOURCE 1 - #define _LARGEFILE64_SOURCE 1 - #include diff --git a/gdal.spec b/gdal.spec index 52dc6e0..3cb8526 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,3 +1,8 @@ +# 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 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) @@ -28,38 +33,34 @@ %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 +#global pre beta1 Name: gdal -Version: 3.6.2 -Release: 8.really3.5.3%{?dist} +Version: 3.12.1 +Release: 1%{?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}-3.5.3%{?pre:%pre}-fedora.tar.xz -Source1: http://download.osgeo.org/%{name}/3.5.3/%{name}autotest-3.5.3%{?pre:%pre}.tar.gz +Source0: %{name}-%{version}%{?pre:%pre}-fedora.tar.xz +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 @@ -71,63 +72,101 @@ Source5: %{name}-cleaner.sh # Add some utils to the default install target Patch0: gdal_utils.patch -# Fix build failure -# inlining failed in call to ‘always_inline’ ‘open.localalias’ -# See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/2526 for a similar issue -Patch1: gdal-fortify-source.patch - BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: armadillo-devel -BuildRequires: cfitsio-devel -BuildRequires: CharLS-devel +BuildRequires: bison BuildRequires: curl-devel BuildRequires: expat-devel -BuildRequires: freexl-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: unzip +BuildRequires: xz-devel +BuildRequires: zlib-devel + +%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 -BuildRequires: json-c-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 -BuildRequires: libpng-devel -BuildRequires: libpq-devel -BuildRequires: librx-devel %if %{with_spatialite} BuildRequires: libspatialite-devel %endif -BuildRequires: libtiff-devel -BuildRequires: libtirpc-devel BuildRequires: libwebp-devel +BuildRequires: libzstd-devel %if 0%{?with_mysql} BuildRequires: mariadb-connector-c-devel %endif +BuildRequires: muParser-devel BuildRequires: netcdf-devel -BuildRequires: ogdi-devel BuildRequires: openexr-devel -BuildRequires: openjpeg2-devel -BuildRequires: pcre2-devel +BuildRequires: openssl-devel-engine +%ifnarch %{ix86} %{arm} +BuildRequires: parquet-libs-devel +%endif %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 +%else +# RHEL dependencies +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel +%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 +%endif + +# Java +%if %{with java} +# For 'mvn_artifact' and 'mvn_install' +BuildRequires: ant-openjdk25 +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local-openjdk25 +BuildRequires: jpackage-utils +%endif + +# MinGW %if %{with mingw} -BuildRequires: mingw32-filesystem >= 102 +BuildRequires: mingw32-filesystem BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-cfitsio BuildRequires: mingw32-curl @@ -136,6 +175,8 @@ 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 BuildRequires: mingw32-libjpeg-turbo @@ -147,7 +188,7 @@ BuildRequires: mingw32-libtiff BuildRequires: mingw32-libwebp BuildRequires: mingw32-openexr BuildRequires: mingw32-openjpeg2 -BuildRequires: mingw32-pcre +BuildRequires: mingw32-pcre2 BuildRequires: mingw32-poppler BuildRequires: mingw32-postgresql BuildRequires: mingw32-proj @@ -155,8 +196,14 @@ 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 >= 102 +BuildRequires: mingw64-filesystem BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-cfitsio BuildRequires: mingw64-curl @@ -165,6 +212,8 @@ 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 BuildRequires: mingw64-libjpeg-turbo @@ -176,7 +225,7 @@ BuildRequires: mingw64-libtiff BuildRequires: mingw64-libwebp BuildRequires: mingw64-openexr BuildRequires: mingw64-openjpeg2 -BuildRequires: mingw64-pcre +BuildRequires: mingw64-pcre2 BuildRequires: mingw64-poppler BuildRequires: mingw64-postgresql BuildRequires: mingw64-proj @@ -184,38 +233,17 @@ BuildRequires: mingw64-sqlite BuildRequires: mingw64-xerces-c BuildRequires: mingw64-xz-libs BuildRequires: mingw64-zlib -%endif - -# Python +BuildRequires: mingw64-zstd %if %{with python3} -BuildRequires: python3-devel -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 +%if 0%{?fedora} Requires: gpsbabel +%endif Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -247,48 +275,7 @@ Provides: bundled(degrib) = 2.14 %description libs This package contains the GDAL file format library. -%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. - - -%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. -%endif - -# No complete java yet in EL8 %if %{with java} %package java Summary: Java modules for the GDAL file format library @@ -328,15 +315,62 @@ 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 +# 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 @@ -344,32 +378,30 @@ 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 %prep -%autosetup -p1 -n %{name}-3.5.3-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-3.5.3 autotest +unzip %{SOURCE1} +mv %{name}autotest-%{version}%{?pre:%pre} autotest + +# Need to patch autotest +%autopatch -p1 # Copy in PROVENANCE.TXT-fedora cp -a %{SOURCE4} . @@ -378,14 +410,26 @@ 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_USE_JPEG12_INTERNAL=OFF + -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ +%endif +%if ! 0%{?fedora} + -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ + -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \ + -DBUILD_PYTHON_BINDINGS=OFF \ + -DBUILD_TESTING=OFF +%endif %cmake_build %if %{with mingw} %mingw_cmake \ + -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ - -DGDAL_USE_JPEG12_INTERNAL=OFF + -DGDAL_USE_EXTERNAL_LIB=ON \ + -DGDAL_USE_INTERNAL_LIBS=OFF %mingw_make_build %endif @@ -400,14 +444,6 @@ 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 @@ -416,6 +452,18 @@ 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 %{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 @@ -424,14 +472,18 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %if 0%{run_tests} %check +# FIXME Tests hang on s390x ppc64le +%ifnarch s390x ppc64le %ctest || : %endif +%endif -%files -f gdal_python_manpages_excludes.txt -%{_bindir}/8211* +%files +%{_bindir}/gdal %{_bindir}/gdal_contour %{_bindir}/gdal_create +%{_bindir}/gdal_footprint %{_bindir}/gdal_grid %{_bindir}/gdal_rasterize %{_bindir}/gdal_translate @@ -456,18 +508,162 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/ogrinfo %{_bindir}/ogrlineref %{_bindir}/ogrtindex +%{_bindir}/sozip +%if 0%{?fedora} +%{_bindir}/8211* %{_bindir}/s57dump -%{_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 +%endif +%{_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 +%{_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/gdalinfo +%{_datadir}/bash-completion/completions/gdallocationinfo +%{_datadir}/bash-completion/completions/gdalmanage +%{_datadir}/bash-completion/completions/gdalsrsinfo +%{_datadir}/bash-completion/completions/gdaltindex +%{_datadir}/bash-completion/completions/gdaltransform +%{_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 +%{_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/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* +%{_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_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* +%{_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-update.1.gz +%{_mandir}/man1/gdal-raster-viewshed.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-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-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/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.31 -%{_libdir}/libgdal.so.31.* +%{_libdir}/libgdal.so.38 +%{_libdir}/libgdal.so.38.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -478,12 +674,100 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_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} %files -n mingw32-%{name} %license LICENSE.TXT -%{mingw32_bindir}/libgdal-31.dll +%{mingw32_bindir}/libgdal-38.dll %{mingw32_bindir}/gdal-config %{mingw32_libdir}/libgdal.dll.a %{mingw32_libdir}/cmake/gdal/ @@ -494,9 +778,52 @@ 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}/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/ +%endif + %files -n mingw64-%{name} %license LICENSE.TXT -%{mingw64_bindir}/libgdal-31.dll +%{mingw64_bindir}/libgdal-38.dll %{mingw64_bindir}/gdal-config %{mingw64_libdir}/libgdal.dll.a %{mingw64_libdir}/cmake/gdal/ @@ -506,65 +833,349 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -n mingw64-%{name}-tools %{mingw64_bindir}/*.exe -%endif %if %{with python3} -%files -n python3-gdal -%doc swig/python/README.rst -%{python3_sitearch}/GDAL-3.5.3-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}/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-3.5.3-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-3.5.3-py%{mingw32_python3_version}.egg-info/ +%{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/ %endif %endif -%if %{with java} -%files java -%{_jnidir}/%{name}/gdal-3.5.3-sources.jar -%{_jnidir}/%{name}/gdal-3.5.3.jar -%{_jnidir}/%{name}/gdal-3.5.3.pom -%{_jnidir}/%{name}/libgdalalljni.so - -%files javadoc -%{_jnidir}/%{name}/gdal-3.5.3-javadoc.jar -%endif - %changelog -* Tue Nov 07 2023 Sandro Mani - 3.6.2-8.really3.5.3 -- Revert to 3.5.x series +* 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) + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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 @@ -1439,7 +2050,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config - 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_utils.patch b/gdal_utils.patch index 6808d89..e0eee7c 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,39 +1,37 @@ -diff -rupN --no-dereference gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200 -+++ gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt 2023-11-07 11:43:16.335937254 +0100 -@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211) +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) # Because linking an OBJECT library - if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) -- 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(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(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}) - endif () -diff -rupN --no-dereference gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200 -+++ gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-07 11:43:16.335937254 +0100 -@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA - gdal_standard_includes(ogr_S57) +-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.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() - if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12) -- 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}) - endif () +-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 3e3554a..18aa636 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.5.3-fedora.tar.xz) = da205c1a23cb076b904046d5a9cc8902933abd3e790aed4fb3e60ba39104035e478465eca2ea44b5c9d3e217580d124de4d6e6a6e7d5ac37b91e644beb9cab18 -SHA512 (gdalautotest-3.5.3.tar.gz) = 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e +SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5 +SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5