Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6e57820f25 | ||
|
|
c55397ce0c |
6 changed files with 112 additions and 255 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -130,14 +130,3 @@ gdalautotest-1.7.0.tar.gz
|
|||
/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
|
||||
|
|
|
|||
11
gdal-3.10.2-integer-types.patch
Normal file
11
gdal-3.10.2-integer-types.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
|
||||
--- gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-01 13:03:21.000000000 +0200
|
||||
+++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-07 13:39:47.674069257 +0200
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <limits>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
#if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__)
|
||||
// gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string
|
||||
302
gdal.spec
302
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)
|
||||
|
|
@ -47,12 +42,12 @@
|
|||
%bcond_with java
|
||||
%endif
|
||||
|
||||
#global pre beta1
|
||||
#global pre rc1
|
||||
|
||||
|
||||
Name: gdal
|
||||
Version: 3.12.1
|
||||
Release: 1%{?dist}
|
||||
Version: 3.10.3
|
||||
Release: 3%{?dist}
|
||||
Summary: GIS file format library
|
||||
License: MIT
|
||||
URL: http://www.gdal.org
|
||||
|
|
@ -60,7 +55,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,6 +67,10 @@ 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: cmake
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -93,7 +92,6 @@ BuildRequires: proj-devel >= 5.2.0
|
|||
BuildRequires: sqlite-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
|
|
@ -127,8 +125,8 @@ 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: openssl-devel-engine
|
||||
%ifnarch %{ix86} %{arm}
|
||||
|
|
@ -158,9 +156,9 @@ BuildRequires: python3dist(lxml) >= 4.5.1
|
|||
# Java
|
||||
%if %{with java}
|
||||
# For 'mvn_artifact' and 'mvn_install'
|
||||
BuildRequires: ant-openjdk25
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: javapackages-local-openjdk25
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: jpackage-utils
|
||||
%endif
|
||||
|
||||
|
|
@ -175,7 +173,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
|
||||
|
|
@ -212,7 +209,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
|
||||
|
|
@ -382,23 +378,22 @@ MinGW Windows Python3 GDAL bindings.
|
|||
%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,8 +405,6 @@ 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} \
|
||||
|
|
@ -419,17 +412,26 @@ cp -a %{SOURCE4} .
|
|||
%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
|
||||
-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
|
||||
|
||||
|
|
@ -455,15 +457,6 @@ 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,15 +465,11 @@ done
|
|||
|
||||
%if 0%{run_tests}
|
||||
%check
|
||||
# FIXME Tests hang on s390x ppc64le
|
||||
%ifnarch s390x ppc64le
|
||||
%ctest || :
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
%{_bindir}/gdal
|
||||
%{_bindir}/gdal_contour
|
||||
%{_bindir}/gdal_create
|
||||
%{_bindir}/gdal_footprint
|
||||
|
|
@ -513,10 +502,9 @@ done
|
|||
%{_bindir}/8211*
|
||||
%{_bindir}/s57dump
|
||||
%endif
|
||||
%{_datadir}/bash-completion/completions/gdal
|
||||
%{_datadir}/bash-completion/completions/gdal-config
|
||||
%{_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
|
||||
|
|
@ -536,134 +524,41 @@ done
|
|||
%{_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*
|
||||
%{_mandir}/man1/gdaladdo.1.*
|
||||
%{_mandir}/man1/gdalbuildvrt.1.*
|
||||
%{_mandir}/man1/gdal-config.1.*
|
||||
%{_mandir}/man1/gdal_contour.1.*
|
||||
%{_mandir}/man1/gdal_create.1.*
|
||||
%{_mandir}/man1/gdaldem.1.*
|
||||
%{_mandir}/man1/gdal_footprint.1.*
|
||||
%{_mandir}/man1/gdal_grid.1.*
|
||||
%{_mandir}/man1/gdalinfo.1.*
|
||||
%{_mandir}/man1/gdallocationinfo.1.*
|
||||
%{_mandir}/man1/gdalmanage.1.*
|
||||
%{_mandir}/man1/gdalmdiminfo.1.*
|
||||
%{_mandir}/man1/gdalmdimtranslate.1.*
|
||||
%{_mandir}/man1/gdal_rasterize.1.*
|
||||
%{_mandir}/man1/gdalsrsinfo.1.*
|
||||
%{_mandir}/man1/gdaltindex.1.*
|
||||
%{_mandir}/man1/gdaltransform.1.*
|
||||
%{_mandir}/man1/gdal_translate.1.*
|
||||
%{_mandir}/man1/gdal_viewshed.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/ogrmerge.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.38
|
||||
%{_libdir}/libgdal.so.38.*
|
||||
%{_libdir}/libgdal.so.36
|
||||
%{_libdir}/libgdal.so.36.*
|
||||
%{_datadir}/%{name}/
|
||||
%{_libdir}/gdalplugins/
|
||||
|
||||
|
|
@ -674,7 +569,6 @@ 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 java}
|
||||
|
|
@ -734,8 +628,6 @@ done
|
|||
%{_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
|
||||
|
|
@ -744,8 +636,12 @@ done
|
|||
%{_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/gdalchksum.py
|
||||
%{_datadir}/bash-completion/completions/gdalcompare.py
|
||||
%{_datadir}/bash-completion/completions/gdalident.py
|
||||
%{_datadir}/bash-completion/completions/gdalimport.py
|
||||
%{_datadir}/bash-completion/completions/gdalmove.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*
|
||||
|
|
@ -767,7 +663,7 @@ done
|
|||
%if %{with mingw}
|
||||
%files -n mingw32-%{name}
|
||||
%license LICENSE.TXT
|
||||
%{mingw32_bindir}/libgdal-38.dll
|
||||
%{mingw32_bindir}/libgdal-36.dll
|
||||
%{mingw32_bindir}/gdal-config
|
||||
%{mingw32_libdir}/libgdal.dll.a
|
||||
%{mingw32_libdir}/cmake/gdal/
|
||||
|
|
@ -823,7 +719,7 @@ done
|
|||
|
||||
%files -n mingw64-%{name}
|
||||
%license LICENSE.TXT
|
||||
%{mingw64_bindir}/libgdal-38.dll
|
||||
%{mingw64_bindir}/libgdal-36.dll
|
||||
%{mingw64_bindir}/gdal-config
|
||||
%{mingw64_libdir}/libgdal.dll.a
|
||||
%{mingw64_libdir}/cmake/gdal/
|
||||
|
|
@ -880,68 +776,8 @@ done
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 18 2025 Sandro Mani <manisandro@gmail.com> - 3.12.1-1
|
||||
- Update to 3.12.1
|
||||
|
||||
* Mon Dec 08 2025 Sandro Mani <manisandro@gmail.com> - 3.12.0-2
|
||||
- Rebuild (libtiff)
|
||||
|
||||
* Sun Nov 16 2025 Sandro Mani <manisandro@gmail.com> - 3.12.0-1
|
||||
- Update to 3.12.0
|
||||
|
||||
* Fri Nov 07 2025 Sandro Mani <manisandro@gmail.com> - 3.11.5-1
|
||||
- Update to 3.11.5
|
||||
|
||||
* Wed Oct 29 2025 Stephen Gallagher <sgallagh@redhat.com> - 3.11.4-6
|
||||
- Rebuild for libarrow 22
|
||||
|
||||
* Thu Oct 09 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 3.11.4-5
|
||||
- Rebuilt for java-25-openjdk as system jdk
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.11.4-4
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Thu Sep 18 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 3.11.4-3
|
||||
- Package manpages and shell completions together with the respective commands
|
||||
|
||||
* Wed Sep 17 2025 Sandro Mani <manisandro@gmail.com> - 3.11.4-2
|
||||
- BR: muparser-devel
|
||||
|
||||
* Sun Sep 14 2025 Sandro Mani <manisandro@gmail.com> - 3.11.4-1
|
||||
- Update to 3.11.4
|
||||
|
||||
* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 3.11.3-7
|
||||
- Rebuild for netcdf 4.9.3 soname bump
|
||||
|
||||
* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 3.11.3-6
|
||||
- Rebuild for netcdf 4.9.3 soname bump
|
||||
|
||||
* Thu Aug 21 2025 Orion Poplawski <orion@nwra.com> - 3.11.3-5
|
||||
- Undefine _preserve_static_debuginfo to prevent huge build times
|
||||
|
||||
* Mon Aug 18 2025 Python Maint <python-maint@redhat.com> - 3.11.3-4
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Wed Aug 13 2025 Orion Poplawski <orion@nwra.com> - 3.11.3-3
|
||||
- Rebuild for libarrow 21
|
||||
|
||||
* Thu Jul 31 2025 Sandro Mani <manisandro@gmail.com> - 3.11.3-2
|
||||
- Rebuild (mingw-poppler)
|
||||
|
||||
* Sun Jul 27 2025 Sandro Mani <manisandro@gmail.com> - 3.11.3-1
|
||||
- Update to 3.11.3
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jul 18 2025 Sandro Mani <manisandro@gmail.com> - 3.10.3-5
|
||||
- Rebuild (poppler)
|
||||
|
||||
* Thu Jul 10 2025 Stephen Gallagher <sgallagh@redhat.com> - 3.10.3-4
|
||||
- Rebuilt for libarrow 20
|
||||
|
||||
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 3.10.3-3
|
||||
- Rebuilt for Python 3.14
|
||||
* Tue Jul 29 2025 Sandro Mani <manisandro@gmail.com> - 3.10.3-3
|
||||
- Fix gdal-cleaner.sh not removing intended files (#2384093)
|
||||
|
||||
* Fri May 16 2025 Sandro Mani <manisandro@gmail.com> - 3.10.3-2
|
||||
- Fix *.py scripts packaging
|
||||
|
|
|
|||
21
gdal_incompatible-pointer-types.patch
Normal file
21
gdal_incompatible-pointer-types.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -rupN --no-dereference gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp
|
||||
--- gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp 2025-04-01 13:03:22.000000000 +0200
|
||||
+++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-04-07 13:39:47.318116680 +0200
|
||||
@@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons
|
||||
pwszFilename[nLen - 1] = 0;
|
||||
#endif
|
||||
|
||||
- int nResult = _wstat64(pwszFilename, pStatBuf);
|
||||
+ int nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
|
||||
|
||||
// If _wstat64() fails and the original name is not an extended one,
|
||||
// then retry with an extended filename
|
||||
@@ -907,7 +907,7 @@ int VSIWin32FilesystemHandler::Stat(cons
|
||||
nLastError == ERROR_FILENAME_EXCED_RANGE)
|
||||
{
|
||||
VSIWin32TryLongFilename(pwszFilename);
|
||||
- nResult = _wstat64(pwszFilename, pStatBuf);
|
||||
+ nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -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.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)
|
||||
|
||||
|
|
@ -22,12 +22,12 @@ diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal
|
|||
target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
|
||||
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
|
||||
+install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
diff -rupN --no-dereference gdal-3.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.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)
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
|
||||
SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
|
||||
SHA512 (gdal-3.10.3-fedora.tar.xz) = c25db41f98ea16cac4e5d742fa78a3b68ae0f0ad21f5ab1825d8daf9d6476050d3a1d23221205434619269d5ebf4a81bf3b7bb47b07e1b979f019a683a1e0e9c
|
||||
SHA512 (gdalautotest-3.10.3.tar.gz) = af8637944498adfbc33b26f747bab0ad6b46216c58a994248ad8e252c90c6050709bef1b0c15986edfb6a87ee7d09bac8fd837266b5deb8980409bb018037c60
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue