diff --git a/GDALmake.opt.in.patch b/GDALmake.opt.in.patch deleted file mode 100644 index 41790eb..0000000 --- a/GDALmake.opt.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/GDALmake.opt.in 2020-05-25 15:09:29.892069150 +0200 -+++ b/GDALmake.opt.in 2020-05-25 15:09:54.164285244 +0200 -@@ -74,7 +74,7 @@ INST_DOCS = @htmldir@ - INST_MAN = @mandir@ - INST_WEB = $(HOME)/www/gdal - --CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION -+CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION - CFLAGS = @CFLAGS@ @C_WFLAGS@ $(USER_DEFS) - CXXFLAGS = @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS) - CFLAGS_NOFTRAPV = @CFLAGS_NOFTRAPV@ @C_WFLAGS@ $(USER_DEFS) diff --git a/gdal-3.3.3.tar.xz b/gdal-3.3.3.tar.xz deleted file mode 100644 index f3c32eb..0000000 --- a/gdal-3.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e8fc8b19c77238c7f4c27857d04857b65d8b7e8050d3aac256d70fa48a21e76 -size 12946356 diff --git a/gdal-3.3.3.tar.xz.md5 b/gdal-3.3.3.tar.xz.md5 deleted file mode 100644 index 755d761..0000000 --- a/gdal-3.3.3.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -9e42f3d11e2fb619b522878901bd1b0f gdal-3.3.3.tar.xz diff --git a/gdal-3.4.1.tar.xz b/gdal-3.4.1.tar.xz new file mode 100644 index 0000000..d27f63c --- /dev/null +++ b/gdal-3.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:332f053516ca45101ef0f7fa96309b64242688a8024780a5d93be0230e42173d +size 13257288 diff --git a/gdal-3.4.1.tar.xz.md5 b/gdal-3.4.1.tar.xz.md5 new file mode 100644 index 0000000..1662861 --- /dev/null +++ b/gdal-3.4.1.tar.xz.md5 @@ -0,0 +1 @@ +6c42056c81abf84edcb2022b53fb2974 gdal-3.4.1.tar.xz diff --git a/gdal.changes b/gdal.changes index 9d88ada..a551841 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jan 4 15:10:17 UTC 2022 - Bruno Friedmann + +- Upgrade to version 3.4.1 bugfix release + + Full changelog https://github.com/OSGeo/gdal/blob/v3.4.0/gdal/NEWS + + Explicitly add a call to autogen.sh + + Upstream PCIDSK: fix write heap-buffer-overflow boo#1194263 +- Removed GDALmake.opt.in.patch due to cc1plus: warning: + -I gcore: No such file or directory [-Wmissing-include-dirs] +- Add conditionnal support for hdf4 boo#1192614 on Leap + build -with hdf4_support can be enabled +- Update copyright year + ------------------------------------------------------------------- Fri Dec 31 19:53:12 UTC 2021 - D. Berge diff --git a/gdal.spec b/gdal.spec index 9e4af65..f01beac 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,7 +1,7 @@ # # spec file for package gdal # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,7 @@ # -%define soversion 29 +%define soversion 30 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL @@ -25,10 +25,11 @@ %bcond_with fgdb_support %bcond_with kml_support %bcond_with sfcgal_support +%bcond_with hdf4_support %bcond_with heif_support %bcond_with tests_support Name: gdal -Version: 3.3.3 +Version: 3.4.1 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: BSD-3-Clause AND MIT AND SUSE-Public-Domain @@ -37,8 +38,6 @@ Source0: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ve Source1: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5 Source2: https://download.osgeo.org/%{name}/%{version}/%{sourcename}autotest-%{version}.tar.gz Patch0: gdal-perl.patch -# Fix occasional parallel build failure -Patch1: GDALmake.opt.in.patch BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake @@ -113,6 +112,9 @@ BuildRequires: pkgconfig(sfcgal) %if %{with heif_support} BuildRequires: libheif-devel %endif +%if %{with hdf4_support} +BuildRequires: hdf-devel +%endif %if %{with ecw5_support} BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel %else @@ -155,6 +157,7 @@ Requires: %{name} = %{version}-%{release} %description -n perl-%{name} Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules. +Deprecated - will be removed in 3.5 %package -n python3-%{pypi_package_name} Summary: GDAL Python3 module @@ -199,6 +202,7 @@ done # Remove shebang in scripts located in non executable dir find swig/python/gdal-utils/osgeo_utils -iname '*.py' -ls -exec sed -i '/^#!\/usr\/bin\/env python3/d' {} \; +find swig/python/gdal-utils/osgeo_utils -iname '*.py' -ls -exec sed -i '/^#!\/usr\/bin\/env python/d' {} \; # Fix wrong /usr/bin/env python3 find . -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \; @@ -213,6 +217,7 @@ ln -s %{_includedir} $ECW_INC_PATH %endif %build +./autogen.sh %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/gdal \ @@ -281,6 +286,9 @@ ln -s %{_includedir} $ECW_INC_PATH --with-opencl \ --without-hdf4 \ --with-hdf5 \ +%if %{with hdf4_support} + --with-hdf4 \ +%endif --with-webp \ --disable-rpath \ --enable-lto @@ -381,7 +389,7 @@ popd %files %license LICENSE.TXT -%doc NEWS PROVENANCE.TXT +%doc NEWS.md PROVENANCE.TXT %{_bindir}/gdal_contour %{_bindir}/gdal_create %{_bindir}/gdal_grid @@ -408,7 +416,6 @@ popd %{_bindir}/ogrinfo %{_bindir}/ogrlineref %{_bindir}/ogrtindex -%{_bindir}/testepsg %{_datadir}/gdal %{_mandir}/man1/gdal_contour.1%{?ext_man} %{_mandir}/man1/gdal_create.1%{?ext_man} @@ -471,7 +478,7 @@ popd %files devel %license LICENSE.TXT -%doc NEWS PROVENANCE.TXT +%doc NEWS.md PROVENANCE.TXT %if %{with docs} %doc doc/build/html/ %endif @@ -484,7 +491,7 @@ popd %files -n perl-%{name} %license LICENSE.TXT -%doc NEWS PROVENANCE.TXT +%doc NEWS.md PROVENANCE.TXT %{perl_vendorarch}/Geo/GDAL.pm %dir %{perl_vendorarch}/Geo/GDAL %{perl_vendorarch}/Geo/GDAL/Const.pm @@ -507,7 +514,7 @@ popd %files -n python3-%{pypi_package_name} %license LICENSE.TXT -%doc NEWS PROVENANCE.TXT +%doc NEWS.md PROVENANCE.TXT %{python3_sitearch}/* %changelog diff --git a/gdalautotest-3.3.3.tar.gz b/gdalautotest-3.3.3.tar.gz deleted file mode 100644 index 9ccf6e9..0000000 --- a/gdalautotest-3.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62eebb6c1437938e007f4065d663163fc449b2561491d51f6c27b917da66114c -size 40847360 diff --git a/gdalautotest-3.4.1.tar.gz b/gdalautotest-3.4.1.tar.gz new file mode 100644 index 0000000..05e871d --- /dev/null +++ b/gdalautotest-3.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30e328099ecb79754613785f354765f506d49815554babdbbc8d8460d68b45ec +size 49233920