diff --git a/.gitignore b/.gitignore index 71e0fa3..ddbc7b9 100644 --- a/.gitignore +++ b/.gitignore @@ -118,26 +118,5 @@ gdalautotest-1.7.0.tar.gz /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.spec b/gdal.spec index 3cb8526..803ddd1 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,8 +1,3 @@ -# 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) @@ -33,26 +28,30 @@ %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 -%else -%bcond_with mingw -%bcond_with python3 -%bcond_with java %endif -#global pre beta1 +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif + +#global pre rc1 Name: gdal -Version: 3.12.1 -Release: 1%{?dist} +Version: 3.9.3 +Release: 2%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -60,7 +59,7 @@ URL: http://www.gdal.org # See PROVENANCE.TXT-fedora and the cleaner script for details! Source0: %{name}-%{version}%{?pre:%pre}-fedora.tar.xz -Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}%{?pre:%pre}.zip +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 @@ -72,42 +71,26 @@ 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 BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: bison -BuildRequires: curl-devel -BuildRequires: expat-devel -BuildRequires: geos-devel -BuildRequires: json-c-devel -BuildRequires: libarchive-devel -BuildRequires: libpng-devel -BuildRequires: libpq-devel -BuildRequires: libtiff-devel -BuildRequires: libtirpc-devel -BuildRequires: mariadb-connector-c-devel -BuildRequires: openjpeg2-devel -BuildRequires: pcre2-devel -BuildRequires: proj-devel >= 5.2.0 -BuildRequires: sqlite-devel -BuildRequires: swig -BuildRequires: unixODBC-devel -BuildRequires: unzip -BuildRequires: xz-devel -BuildRequires: zlib-devel - -%if 0%{?fedora} -# Fedora dependencies BuildRequires: armadillo-devel -BuildRequires: blosc-devel +BuildRequires: bison BuildRequires: cfitsio-devel BuildRequires: CharLS-devel +BuildRequires: curl-devel +BuildRequires: expat-devel BuildRequires: freexl-devel +BuildRequires: geos-devel BuildRequires: giflib-devel BuildRequires: gtest-devel BuildRequires: hdf-devel BuildRequires: hdf5-devel +BuildRequires: json-c-devel +BuildRequires: libarchive-devel %ifnarch %{ix86} %{arm} BuildRequires: libarrow-devel BuildRequires: libarrow-dataset-devel @@ -119,54 +102,41 @@ BuildRequires: libgta-devel BuildRequires: libjpeg-devel BuildRequires: libkml-devel BuildRequires: liblerc-devel +BuildRequires: libpng-devel +BuildRequires: libpq-devel %if %{with_spatialite} BuildRequires: libspatialite-devel %endif +BuildRequires: libtiff-devel +BuildRequires: libtirpc-devel BuildRequires: libwebp-devel BuildRequires: libzstd-devel %if 0%{?with_mysql} BuildRequires: mariadb-connector-c-devel %endif -BuildRequires: muParser-devel BuildRequires: netcdf-devel +BuildRequires: ogdi-devel BuildRequires: openexr-devel +BuildRequires: openjpeg2-devel BuildRequires: openssl-devel-engine %ifnarch %{ix86} %{arm} BuildRequires: parquet-libs-devel %endif +BuildRequires: pcre2-devel %if 0%{?with_poppler} BuildRequires: poppler-devel %endif +BuildRequires: proj-devel >= 5.2.0 BuildRequires: qhull-devel +BuildRequires: sqlite-devel +BuildRequires: swig +BuildRequires: unixODBC-devel BuildRequires: xerces-c-devel -%else -# RHEL dependencies -BuildRequires: libjpeg-turbo-devel -BuildRequires: openssl-devel -%endif +BuildRequires: xz-devel +BuildRequires: zlib-devel -# Python -%if %{with python3} -BuildRequires: python3-devel -BuildRequires: python3-filelock -BuildRequires: python3-numpy -BuildRequires: python3-setuptools -BuildRequires: python3dist(pytest) >= 3.6 -BuildRequires: python3dist(lxml) >= 4.5.1 -%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 +BuildRequires: mingw32-filesystem >= 102 BuildRequires: mingw32-gcc-c++ BuildRequires: mingw32-cfitsio BuildRequires: mingw32-curl @@ -175,7 +145,6 @@ 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 @@ -197,13 +166,8 @@ 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-filesystem >= 102 BuildRequires: mingw64-gcc-c++ BuildRequires: mingw64-cfitsio BuildRequires: mingw64-curl @@ -212,7 +176,6 @@ 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 @@ -234,16 +197,39 @@ BuildRequires: mingw64-xerces-c BuildRequires: mingw64-xz-libs BuildRequires: mingw64-zlib BuildRequires: mingw64-zstd +%endif + +# Python %if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-filelock +BuildRequires: python3-numpy +BuildRequires: python3-setuptools +BuildRequires: python3dist(pytest) >= 3.6 +BuildRequires: python3dist(lxml) >= 4.5.1 + +%if %{with mingw} +BuildRequires: mingw32-python3 +BuildRequires: mingw32-python3-numpy +BuildRequires: mingw32-python3-setuptools + BuildRequires: mingw64-python3 BuildRequires: mingw64-python3-numpy BuildRequires: mingw64-python3-setuptools %endif %endif -%if 0%{?fedora} -Requires: gpsbabel +# Java +%if %{with java} +# For 'mvn_artifact' and 'mvn_install' +BuildRequires: ant +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local +BuildRequires: jpackage-utils %endif + +# Run time dependency for gpsbabel driver +Requires: gpsbabel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -275,7 +261,48 @@ 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 @@ -315,62 +342,15 @@ 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 @@ -378,27 +358,32 @@ 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 -N -p1 -n %{name}-%{version}%{?pre:%pre}-fedora +%autosetup -N -p1 -n %{name}-%{version}-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 -# FIXME: frmts/libertiff/libtiff_codecs.h requires tif_lzw.c, tif_packbits.c, tif_lerc.c -# rm -rf frmts/gtiff/libtiff +rm -rf frmts/gtiff/libtiff rm -rf mrf/LERCV1 rm -rf third_party/LercLib # Setup autotest directory -unzip %{SOURCE1} -mv %{name}autotest-%{version}%{?pre:%pre} autotest +tar xf %{SOURCE1} +mv %{name}autotest-%{version} autotest # Need to patch autotest %autopatch -p1 @@ -410,26 +395,18 @@ cp -a %{SOURCE4} . %build %cmake \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ - -DGDAL_USE_EXTERNAL_LIB=ON \ - -DGDAL_USE_INTERNAL_LIBS=OFF \ -%if %{with java} -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ -%endif -%if ! 0%{?fedora} - -DGDAL_BUILD_OPTIONAL_DRIVERS=OFF \ - -DOGR_BUILD_OPTIONAL_DRIVERS=OFF \ - -DBUILD_PYTHON_BINDINGS=OFF \ - -DBUILD_TESTING=OFF -%endif + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DENABLE_DEFLATE64=OFF %cmake_build %if %{with mingw} %mingw_cmake \ -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ - -DGDAL_USE_EXTERNAL_LIB=ON \ - -DGDAL_USE_INTERNAL_LIBS=OFF + -DGDAL_USE_JPEG12_INTERNAL=OFF \ + -DENABLE_DEFLATE64=OFF %mingw_make_build %endif @@ -444,6 +421,14 @@ 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 @@ -452,18 +437,6 @@ 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 @@ -472,198 +445,70 @@ done %if 0%{run_tests} %check -# FIXME Tests hang on s390x ppc64le -%ifnarch s390x ppc64le %ctest || : %endif -%endif -%files -%{_bindir}/gdal +%files -f gdal_python_manpages_excludes.txt +%{_bindir}/8211* +%{_bindir}/gdal2tiles +%{_bindir}/gdal2xyz +%{_bindir}/gdaladdo +%{_bindir}/gdalattachpct +%{_bindir}/gdalbuildvrt +%{_bindir}/gdal_calc +%{_bindir}/gdalcompare %{_bindir}/gdal_contour %{_bindir}/gdal_create +%{_bindir}/gdaldem +%{_bindir}/gdal_edit +%{_bindir}/gdalenhance +%{_bindir}/gdal_fillnodata %{_bindir}/gdal_footprint %{_bindir}/gdal_grid -%{_bindir}/gdal_rasterize -%{_bindir}/gdal_translate -%{_bindir}/gdal_viewshed -%{_bindir}/gdaladdo -%{_bindir}/gdalbuildvrt -%{_bindir}/gdaldem -%{_bindir}/gdalenhance %{_bindir}/gdalinfo %{_bindir}/gdallocationinfo %{_bindir}/gdalmanage %{_bindir}/gdalmdiminfo %{_bindir}/gdalmdimtranslate +%{_bindir}/gdal_merge +%{_bindir}/gdalmove +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_proximity +%{_bindir}/gdal_rasterize +%{_bindir}/gdal_retile +%{_bindir}/gdal_sieve %{_bindir}/gdalsrsinfo %{_bindir}/gdaltindex %{_bindir}/gdaltransform +%{_bindir}/gdal_translate +%{_bindir}/gdal_viewshed %{_bindir}/gdalwarp %{_bindir}/gnmanalyse %{_bindir}/gnmmanage %{_bindir}/nearblack %{_bindir}/ogr2ogr %{_bindir}/ogrinfo +%{_bindir}/ogr_layer_algebra %{_bindir}/ogrlineref +%{_bindir}/ogrmerge %{_bindir}/ogrtindex -%{_bindir}/sozip -%if 0%{?fedora} -%{_bindir}/8211* +%{_bindir}/pct2rgb +%{_bindir}/rgb2pct %{_bindir}/s57dump -%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* +%{_bindir}/sozip +%{_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 %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS PROVENANCE.TXT-fedora -%{_libdir}/libgdal.so.38 -%{_libdir}/libgdal.so.38.* +%{_libdir}/libgdal.so.35 +%{_libdir}/libgdal.so.35.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -674,9 +519,115 @@ done %{_libdir}/lib%{name}.so %{_libdir}/cmake/gdal/ %{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/bash-completion/completions/gdal-config %{_mandir}/man1/gdal-config.1* +%if %{with mingw} +%files -n mingw32-%{name} +%license LICENSE.TXT +%{mingw32_bindir}/libgdal-35.dll +%{mingw32_bindir}/gdal-config +%{mingw32_libdir}/libgdal.dll.a +%{mingw32_libdir}/cmake/gdal/ +%{mingw32_libdir}/pkgconfig/gdal.pc +%{mingw32_libdir}/gdalplugins/ +%{mingw32_includedir}/%{name}/ + +%files -n mingw32-%{name}-tools +%{mingw32_bindir}/*.exe +%{mingw32_bindir}/gdal2tiles +%{mingw32_bindir}/gdal2xyz +%{mingw32_bindir}/gdal_calc +%{mingw32_bindir}/gdal_edit +%{mingw32_bindir}/gdal_fillnodata +%{mingw32_bindir}/gdal_merge +%{mingw32_bindir}/gdal_pansharpen +%{mingw32_bindir}/gdal_polygonize +%{mingw32_bindir}/gdal_proximity +%{mingw32_bindir}/gdal_retile +%{mingw32_bindir}/gdal_sieve +%{mingw32_bindir}/gdalattachpct +%{mingw32_bindir}/gdalcompare +%{mingw32_bindir}/gdalmove +%{mingw32_bindir}/ogr_layer_algebra +%{mingw32_bindir}/ogrmerge +%{mingw32_bindir}/pct2rgb +%{mingw32_bindir}/rgb2pct + +%files -n mingw64-%{name} +%license LICENSE.TXT +%{mingw64_bindir}/libgdal-35.dll +%{mingw64_bindir}/gdal-config +%{mingw64_libdir}/libgdal.dll.a +%{mingw64_libdir}/cmake/gdal/ +%{mingw64_libdir}/pkgconfig/gdal.pc +%{mingw64_libdir}/gdalplugins/ +%{mingw64_includedir}/%{name}/ + +%files -n mingw64-%{name}-tools +%{mingw64_bindir}/*.exe +%{mingw64_bindir}/gdal2tiles +%{mingw64_bindir}/gdal2xyz +%{mingw64_bindir}/gdal_calc +%{mingw64_bindir}/gdal_edit +%{mingw64_bindir}/gdal_fillnodata +%{mingw64_bindir}/gdal_merge +%{mingw64_bindir}/gdal_pansharpen +%{mingw64_bindir}/gdal_polygonize +%{mingw64_bindir}/gdal_proximity +%{mingw64_bindir}/gdal_retile +%{mingw64_bindir}/gdal_sieve +%{mingw64_bindir}/gdalattachpct +%{mingw64_bindir}/gdalcompare +%{mingw64_bindir}/gdalmove +%{mingw64_bindir}/ogr_layer_algebra +%{mingw64_bindir}/ogrmerge +%{mingw64_bindir}/pct2rgb +%{mingw64_bindir}/rgb2pct +%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 -f gdal_python_manpages.txt +%{_bindir}/gdal_calc.py +%{_bindir}/gdal_edit.py +%{_bindir}/gdal_fillnodata.py +%{_bindir}/gdal_merge.py +%{_bindir}/gdal_pansharpen.py +%{_bindir}/gdal_polygonize.py +%{_bindir}/gdal_proximity.py +%{_bindir}/gdal_retile.py +%{_bindir}/gdal_sieve.py +%{_bindir}/gdal2tiles.py +%{_bindir}/gdal2xyz.py +%{_bindir}/gdalattachpct.py +%{_bindir}/gdalcompare.py +%{_bindir}/gdalmove.py +%{_bindir}/ogr_layer_algebra.py +%{_bindir}/ogrmerge.py +%{_bindir}/pct2rgb.py +%{_bindir}/rgb2pct.py +%{_datadir}/bash-completion/completions/*.py + +%if %{with mingw} +%files -n mingw32-python3-%{name} +%{mingw32_bindir}/*.py +%{mingw32_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ +%{mingw32_python3_sitearch}/osgeo/ +%{mingw32_python3_sitearch}/osgeo_utils/ + +%files -n mingw64-python3-%{name} +%{mingw64_bindir}/*.py +%{mingw64_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ +%{mingw64_python3_sitearch}/osgeo/ +%{mingw64_python3_sitearch}/osgeo_utils/ +%endif +%endif + %if %{with java} %files java %{_jnidir}/%{name}/gdal-%{version}-sources.jar @@ -688,317 +639,10 @@ done %{_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-38.dll -%{mingw32_bindir}/gdal-config -%{mingw32_libdir}/libgdal.dll.a -%{mingw32_libdir}/cmake/gdal/ -%{mingw32_libdir}/pkgconfig/gdal.pc -%{mingw32_libdir}/gdalplugins/ -%{mingw32_includedir}/%{name}/ - -%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-38.dll -%{mingw64_bindir}/gdal-config -%{mingw64_libdir}/libgdal.dll.a -%{mingw64_libdir}/cmake/gdal/ -%{mingw64_libdir}/pkgconfig/gdal.pc -%{mingw64_libdir}/gdalplugins/ -%{mingw64_includedir}/%{name}/ - -%files -n mingw64-%{name}-tools -%{mingw64_bindir}/*.exe - -%if %{with python3} -%files -n mingw64-python3-%{name} -%{mingw64_bindir}/gdal2tiles -%{mingw64_bindir}/gdal2tiles.py -%{mingw64_bindir}/gdal2xyz -%{mingw64_bindir}/gdal2xyz.py -%{mingw64_bindir}/gdal_calc -%{mingw64_bindir}/gdal_calc.py -%{mingw64_bindir}/gdal_edit -%{mingw64_bindir}/gdal_edit.py -%{mingw64_bindir}/gdal_fillnodata -%{mingw64_bindir}/gdal_fillnodata.py -%{mingw64_bindir}/gdal_merge -%{mingw64_bindir}/gdal_merge.py -%{mingw64_bindir}/gdal_pansharpen -%{mingw64_bindir}/gdal_pansharpen.py -%{mingw64_bindir}/gdal_polygonize -%{mingw64_bindir}/gdal_polygonize.py -%{mingw64_bindir}/gdal_proximity -%{mingw64_bindir}/gdal_proximity.py -%{mingw64_bindir}/gdal_retile -%{mingw64_bindir}/gdal_retile.py -%{mingw64_bindir}/gdal_sieve -%{mingw64_bindir}/gdal_sieve.py -%{mingw64_bindir}/gdalattachpct -%{mingw64_bindir}/gdalattachpct.py -%{mingw64_bindir}/gdalcompare -%{mingw64_bindir}/gdalcompare.py -%{mingw64_bindir}/gdalmove -%{mingw64_bindir}/gdalmove.py -%{mingw64_bindir}/ogr_layer_algebra -%{mingw64_bindir}/ogr_layer_algebra.py -%{mingw64_bindir}/ogrmerge -%{mingw64_bindir}/ogrmerge.py -%{mingw64_bindir}/pct2rgb -%{mingw64_bindir}/pct2rgb.py -%{mingw64_bindir}/rgb2pct -%{mingw64_bindir}/rgb2pct.py -%{mingw64_python3_sitearch}/GDAL-%{version}-py%{mingw32_python3_version}.egg-info/ -%{mingw64_python3_sitearch}/osgeo/ -%{mingw64_python3_sitearch}/osgeo_utils/ -%endif -%endif - %changelog -* Thu Dec 18 2025 Sandro Mani - 3.12.1-1 -- Update to 3.12.1 - -* Mon Dec 08 2025 Sandro Mani - 3.12.0-2 -- Rebuild (libtiff) - -* 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 Jul 29 2025 Sandro Mani - 3.9.3-2 +- Fix gdal-cleaner.sh not removing intended files (#2384093) * Tue Oct 15 2024 Sandro Mani - 3.9.3-1 - Update to 3.9.3 diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch new file mode 100644 index 0000000..21678b8 --- /dev/null +++ b/gdal_incompatible-pointer-types.patch @@ -0,0 +1,21 @@ +diff -rupN --no-dereference gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.9.3-fedora/port/cpl_vsil_win32.cpp 2024-10-07 18:02:07.000000000 +0200 ++++ gdal-3.9.3-fedora-new/port/cpl_vsil_win32.cpp 2024-10-15 08:07:44.994694330 +0200 +@@ -868,7 +868,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 +@@ -879,7 +879,7 @@ int VSIWin32FilesystemHandler::Stat(cons + nLastError == ERROR_FILENAME_EXCED_RANGE) + { + VSIWin32TryLongFilename(pwszFilename); +- nResult = _wstat64(pwszFilename, pStatBuf); ++ nResult = _wstat64(pwszFilename, reinterpret_cast(pStatBuf)); + } + } + diff --git a/gdal_utils.patch b/gdal_utils.patch index e0eee7c..a3f3868 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,6 +1,6 @@ -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 +diff -rupN --no-dereference gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.9.3-fedora/frmts/iso8211/CMakeLists.txt 2024-10-07 18:02:06.000000000 +0200 ++++ gdal-3.9.3-fedora-new/frmts/iso8211/CMakeLists.txt 2024-10-15 08:07:44.760697595 +0200 @@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P gdal_standard_includes(gdal_iso8211) @@ -22,12 +22,12 @@ diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal target_include_directories(8211createfromxml PRIVATE $) target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) +install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100 -+++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 16:35:42.369966573 +0100 -@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES) - target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES) - endif() +diff -rupN --no-dereference gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.9.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-10-07 18:02:06.000000000 +0200 ++++ gdal-3.9.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-10-15 08:07:44.760697595 +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) diff --git a/sources b/sources index 18aa636..80809cf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5 -SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5 +SHA512 (gdalautotest-3.9.3.tar.gz) = a9f44065bb5817cdc32995cd57f65f8a588dfaea77d4a5bc2d9ea361ef1423843358d7e31be2e27505b6e991d07b18f0f5c3fd9526cf697c74bc88f558205d61 +SHA512 (gdal-3.9.3-fedora.tar.xz) = 55d2351e103372e3effd74dd21e763a9c281b1005d9c452f058da9f78469470e910fceff2d4f92b028c0185f55ecbcd62f044cbe9faf0f3702d7361f84324772