diff --git a/33EBBFC47B3DD87D.pkey b/33EBBFC47B3DD87D.pkey new file mode 100644 index 0000000..0f7cbc4 --- /dev/null +++ b/33EBBFC47B3DD87D.pkey @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFWDB10BCADeJcYKb4zsG2fs3MWGf996ZS4KIiOBRNQtQwCI5+h3K8m1qDur +qyRZ50tB/ODJwJNqdKGdGyrIvGDynsS9JsZMJ2PVoI9IK+X/vQiokx9lJCuDXTtw +1THmA85lyl1blLe3j6tA74MSXDiT3nVk375djTz+zOGxa/Ueg49tM+DjltYpkVsG +TCc29/QJ4rZmto0Lj8iU+9S7S8H/2/54qUn7vFzfzsTkI8fiLM0deCzONzE7j9Ho +vj/8dSHmB5GOGtLf2kMHbgDhHfs61UN4FawugnilCfrxVzi5EmmEByP8Zp6h/or5 ++QrTCFrVEW+zRXDGsqicN01rK22/JvyUbpyNABEBAAG0KUV2ZW4gUm91YXVsdCA8 +ZXZlbi5yb3VhdWx0QHNwYXRpYWx5cy5jb20+iQE4BBMBAgAiBQJVgwddAhsDBgsJ +CAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAz67/Eez3YfZphB/9H/fWUakZqzlqi +NhZbev0um5GUYBERB7cp8JqmILF6TzCvievmR8q0zJb3vyc+8Kjti/n5CyziWDtH +XqibyhsoAFoOHhyMjQVj/hFR6oCWxF6fASkzpUSoDAHtVpFXqaLrbI1B2Fb9JpTs +VrHz0HVaW30E7eybmi7oYjV4T1bO22D/aH80zx3i6cLnoGqMCHmKrwNOK7A95mKj +k9s9GRbamR/3ef8BDF3xikDe8nSxICVc3WJbMHcGjHU6p8C/RzCvWqfHDtTuiWcG +feqaA1LmBKtpIHwG1uigM8+MJT+S+NYljTLqbz0FsORbUQ1QqXuqrfNoBqAEbLxg +esSGPx7UuQENBFWDB10BCADwo42Jwl14Tq3xhPM+1BSOfy3Aw6wTXsWzxoDABs+8 +42WhD53vn7MnOSz2VX4cTvw4ioi+N3NB2zaHGNTrwyV3DExh0d8ZNq53IXoMYfot +Uv/lZ6QHJB+kIYe+twOjkKCYj4jt1m7aEDZ3Ra4aoZbYWfFbQNZ0tnUKFVUBWcWQ +jyCWC84BdXkbxcmsr2njocqyu0lfjXpVcCBcTCcgf/LHy79asm4jgB0XpE+e8ri8 +kEadj7x7x4rrhJfa9t3oJ3AZ3rmo5zzFdbJtNKhCmwCoHrvRNWOPn6u5E7YYW9kB +xgzUUhh1g2F9RMbh3CZjICi9HtbWK3slWGYTaMt4lg/ZABEBAAGJAR8EGAECAAkF +AlWDB10CGwwACgkQM+u/xHs92H2a0wf/XV0XjqMWufAIKkvL6CmrZrCixWmPOiC1 +q8894h+gR5JpKD9h0gLJhtk4tLMy+pDmNSxPXsoRYHneJIqHl1M72Q7vEhTKIVXn +h9A306ZjCHTTNSQ3npNG1wpO0LyLDmn+Zvd1JBoFyCzsTPZ+TbUYvVJT0CeFbJBe +1JzoO1Mi2fOtA91GuYtstWLNccDbv2b5s+JSbAf3ix3+qiUpA5fglWFljCYPxzkA +eU8AReBpuirD0ZQ1Z7GJDJs2zHKZu5BqCTf5gpVLUHCXd3F46CZ4IaVrOGhNP1Ki +KemC/dPHz7Ku7HN0tqmmmu12nvUACBckNsVebCefOFrkGtdryHQ1Zw== +=4/vP +-----END PGP PUBLIC KEY BLOCK----- diff --git a/Makefile b/Makefile index 77da6bb..ab2303b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := gdal -URL = https://download.osgeo.org/gdal/CURRENT/gdal-3.8.3.tar.xz +URL = https://download.osgeo.org/gdal/CURRENT/gdal-3.8.4.tar.xz ARCHIVES = include ../common/Makefile.common diff --git a/buildreq_cache b/buildreq_cache index db35d94..3f0a779 100644 --- a/buildreq_cache +++ b/buildreq_cache @@ -1,4 +1,4 @@ -3.8.3 +3.8.4 pcre-dev pcre2-dev pkgconfig(libpng) diff --git a/gdal-3.8.4.tar.xz.sig b/gdal-3.8.4.tar.xz.sig new file mode 100644 index 0000000..d3feea1 Binary files /dev/null and b/gdal-3.8.4.tar.xz.sig differ diff --git a/gdal.spec b/gdal.spec index 88c91c3..a04bbf6 100644 --- a/gdal.spec +++ b/gdal.spec @@ -2,14 +2,17 @@ # This file is auto-generated. DO NOT EDIT # Generated by: autospec.py # Using build pattern: cmake -# autospec version: v3 -# autospec commit: ab27b0e +# autospec version: v4 +# autospec commit: da8b975 +# +# Source0 file verified with key 0x33EBBFC47B3DD87D (even.rouault@spatialys.com) # Name : gdal -Version : 3.8.3 -Release : 112 -URL : https://download.osgeo.org/gdal/CURRENT/gdal-3.8.3.tar.xz -Source0 : https://download.osgeo.org/gdal/CURRENT/gdal-3.8.3.tar.xz +Version : 3.8.4 +Release : 113 +URL : https://download.osgeo.org/gdal/CURRENT/gdal-3.8.4.tar.xz +Source0 : https://download.osgeo.org/gdal/CURRENT/gdal-3.8.4.tar.xz +Source1 : https://download.osgeo.org/gdal/CURRENT/gdal-3.8.4.tar.xz.sig Summary : Geospatial Data Abstraction Library Group : Development/Tools License : Apache-2.0 BSD-3-Clause ISC LGPL-2.0 Libpng MIT Public-Domain @@ -144,15 +147,15 @@ python3 components for the gdal package. %prep -%setup -q -n gdal-3.8.3 -cd %{_builddir}/gdal-3.8.3 +%setup -q -n gdal-3.8.4 +cd %{_builddir}/gdal-3.8.4 %build export http_proxy=http://127.0.0.1:9/ export https_proxy=http://127.0.0.1:9/ export no_proxy=localhost,127.0.0.1,0.0.0.0 export LANG=C.UTF-8 -export SOURCE_DATE_EPOCH=1704815315 +export SOURCE_DATE_EPOCH=1708361076 mkdir -p clr-build pushd clr-build export GCC_IGNORE_WERROR=1 @@ -169,6 +172,7 @@ FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS" FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS" ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS" LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS" +export GOAMD64=v2 %cmake .. make %{?_smp_mflags} popd @@ -188,10 +192,11 @@ FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS" FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS" ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS" LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS" -CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -m64 -Wl,-z,x86-64-v3" -CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -m64 -Wl,-z,x86-64-v3" -FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -m64 -Wl,-z,x86-64-v3" -FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 -m64 -Wl,-z,x86-64-v3" +GOAMD64=v3 +CFLAGS="$CLEAR_INTERMEDIATE_CFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +CXXFLAGS="$CLEAR_INTERMEDIATE_CXXFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS -march=x86-64-v3 -Wl,-z,x86-64-v3 " +FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS -march=x86-64-v3 " %cmake .. make %{?_smp_mflags} popd @@ -211,7 +216,7 @@ FFLAGS="$CLEAR_INTERMEDIATE_FFLAGS" FCFLAGS="$CLEAR_INTERMEDIATE_FCFLAGS" ASFLAGS="$CLEAR_INTERMEDIATE_ASFLAGS" LDFLAGS="$CLEAR_INTERMEDIATE_LDFLAGS" -export SOURCE_DATE_EPOCH=1704815315 +export SOURCE_DATE_EPOCH=1708361076 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/gdal cp %{_builddir}/gdal-%{version}/LICENSE.TXT %{buildroot}/usr/share/package-licenses/gdal/51134147a0feb5f2a47099a8b81d33f1099dfd21 || : @@ -227,9 +232,12 @@ cp %{_builddir}/gdal-%{version}/ogr/ogrsf_frmts/shape/COPYING %{buildroot}/usr/s cp %{_builddir}/gdal-%{version}/port/LICENCE_minizip %{buildroot}/usr/share/package-licenses/gdal/f7f1d88d0aea6c567a2c351b08b0fe80f2582054 || : cp %{_builddir}/gdal-%{version}/third_party/LercLib/LICENSE %{buildroot}/usr/share/package-licenses/gdal/3035b519169390d1aaa3a43267deaae5cdff8a9b || : cp %{_builddir}/gdal-%{version}/third_party/fast_float/LICENSE-MIT %{buildroot}/usr/share/package-licenses/gdal/11e6be99fa6ad788d013a38598c7da3e5d90efbe || : +export GOAMD64=v2 +GOAMD64=v3 pushd clr-build-avx2 %make_install_v3 || : popd +GOAMD64=v2 pushd clr-build %make_install popd @@ -592,9 +600,9 @@ rm -f %{buildroot}*/usr/etc/bash_completion.d/gdal-bash-completion.sh %files lib %defattr(-,root,root,-) -/V3/usr/lib64/libgdal.so.34.3.8.3 +/V3/usr/lib64/libgdal.so.34.3.8.4 /usr/lib64/libgdal.so.34 -/usr/lib64/libgdal.so.34.3.8.3 +/usr/lib64/libgdal.so.34.3.8.4 %files license %defattr(0644,root,root,0755) diff --git a/options.conf b/options.conf index af75f8f..7884984 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = gdal -url = https://download.osgeo.org/gdal/CURRENT/gdal-3.8.3.tar.xz +url = https://download.osgeo.org/gdal/CURRENT/gdal-3.8.4.tar.xz archives = giturl = https://github.com/OSGeo/gdal.git domain = @@ -9,6 +9,8 @@ alias = [autospec] # build 32 bit libraries 32bit = false +# allow windows executables (*.exe, *.dll) to be packaged +allow_exe = false # allow package to build with test failures allow_test_failures = false # unset %build ld_as_needed variable @@ -60,7 +62,7 @@ skip_tests = false # add .so files to the lib package instead of dev so_to_lib = false # configure build for apx -use_apx = true +use_apx = false # configure build for avx2 use_avx2 = true # configure build for avx512 @@ -70,5 +72,5 @@ use_clang = false # configure build for lto use_lto = true # require package verification for build -verify_required = false +verify_required = true diff --git a/release b/release index 194b81c..9b252fd 100644 --- a/release +++ b/release @@ -1 +1 @@ -112 +113 diff --git a/upstream b/upstream index 8bd3124..6d37c61 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -2d8f815c92d93c914838181e2d656f224fea3411/gdal-3.8.3.tar.xz +e92135ddd9cd5888cfa21438612d3373ab196d3f/gdal-3.8.4.tar.xz diff --git a/used_libs b/used_libs index a9a191f..22e9ef7 100644 --- a/used_libs +++ b/used_libs @@ -16,7 +16,7 @@ liblzma.so.5 libm.so.6 libpcre2-8.so.0 libpng16.so.16 -libpoppler.so.133 +libpoppler.so.134 libproj.so.25 libspatialite.so.8 libsqlite3.so.0