Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2021-06-14 23:11:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Mon Jun 14 23:11:02 2021 rev:62 rq:899883 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2021-06-01 10:35:18.420592936 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.32437/gdal.changes 2021-06-14 23:11:32.160799308 +0200 @@ -1,0 +2,16 @@ +Mon May 24 16:23:53 UTC 2021 - Bruno Friedmann <br...@ioda-net.ch> + +- Update to 3.3.0 version + * Full changelog + https://github.com/OSGeo/gdal/blob/v3.3.0/gdal/NEWS + * Main changes python2 is now gone +- Packaging + + bump libso version to 2.9 + + Remove python2 related stuff + + Add support for heif,pcre,kml,sfcgal + make conditionnal support of libkml, sfcgal, heif + + Prepare tests also conditionnal + + Several small cleanup (merged, no more) + + Remove autoreconf upstream is using last available + +------------------------------------------------------------------- Old: ---- gdal-3.2.3.tar.xz gdal-3.2.3.tar.xz.md5 New: ---- gdal-3.3.0.tar.xz gdal-3.3.0.tar.xz.md5 gdalautotest-3.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.GkvIs2/_old 2021-06-14 23:11:33.280801331 +0200 +++ /var/tmp/diff_new_pack.GkvIs2/_new 2021-06-14 23:11:33.284801338 +0200 @@ -16,22 +16,26 @@ # -%define soversion 28 +%define soversion 29 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL %bcond_with ecw_support %bcond_with ecw5_support %bcond_with fgdb_support -%bcond_without python2 +%bcond_with kml_support +%bcond_with sfcgal_support +%bcond_with heif_support +%bcond_with tests_support Name: gdal -Version: 3.2.3 +Version: 3.3.0 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 URL: https://www.gdal.org/ -Source0: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz -Source1: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5 +Source0: https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz +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 @@ -58,10 +62,17 @@ BuildRequires: pkgconfig BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools +%if %{with tests_support} +BuildRequires: python3-lxml +BuildRequires: python3-pytest +BuildRequires: python3-pytest-env +BuildRequires: python3-pytest-sugar +%endif BuildRequires: swig BuildRequires: unixODBC-devel BuildRequires: pkgconfig(OpenCL) BuildRequires: pkgconfig(expat) >= 1.95.0 +# BuildRequires: pkgconfig(armadillo) BuildRequires: pkgconfig(freexl) BuildRequires: pkgconfig(json) BuildRequires: pkgconfig(json-c) @@ -69,6 +80,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libopenjp2) +BuildRequires: pkgconfig(libpcrecpp) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libtiff-4) >= 3.6.0 @@ -81,17 +93,23 @@ BuildRequires: pkgconfig(ocl-icd) BuildRequires: pkgconfig(poppler) BuildRequires: pkgconfig(proj) +#BuildRequires: pkgconfig(qhull_r) BuildRequires: pkgconfig(spatialite) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(zlib) >= 1.1.4 -%if %{with python2} -BuildRequires: python-numpy-devel -BuildRequires: python-setuptools -%endif %if %{with fgdb_support} BuildRequires: filegdb_api-devel %endif +%if %{with kml_support} +BuildRequires: pkgconfig(libkml) +%endif +%if %{with sfcgal_support} +BuildRequires: pkgconfig(sfcgal) +%endif +%if %{with heif_support} +BuildRequires: libheif-devel +%endif %if %{with ecw5_support} BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel %else @@ -135,18 +153,6 @@ %description -n perl-%{name} Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules. -%package -n python2-%{pypi_package_name} -Summary: GDAL Python module -Requires: %{name} = %{version}-%{release} -# Renaming to uppercase 'GDAL' during 2.4.0; previously used lowercase -Provides: python2-%{name} = %{version} -Obsoletes: python2-%{name} < %{version} -Provides: python-%{name} = %{version} -Obsoletes: python-%{name} < %{version} - -%description -n python2-%{pypi_package_name} -The GDAL python modules provide support to handle multiple GIS file formats. - %package -n python3-%{pypi_package_name} Summary: GDAL Python3 module Requires: %{name} = %{version}-%{release} @@ -159,7 +165,8 @@ %prep %setup -q -n %{sourcename}-%{version} %autopatch -p1 - +# Prepare tests +tar -xf %{S:2} # Delete bundled libraries rm -rv frmts/zlib rm -rv frmts/png/libpng @@ -168,6 +175,7 @@ rm -rv frmts/jpeg/libjpeg12 rm -rv frmts/gtiff/libgeotiff rm -rv frmts/gtiff/libtiff +# internal but needed rm -rv frmts/pcidsk # Set the right (build) libproj.so version, use the upper found version. PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') @@ -185,12 +193,9 @@ for F in frmt_twms_srtm.xml frmt_wms_bluemarble_s3_tms.xml frmt_wms_virtualearth.xml frmt_twms_Clementine.xml;do find . -name "${F}" -exec dos2unix {} \; done -# Fix spurious exec perm -find . -type f -name "style_ogr_brush.png" -exec chmod 0644 {} \; -find . -type f -name "style_ogr_sym.png" -exec chmod 0644 {} \; # Remove shebang in scripts located in non executable dir -find swig/python/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 python3/d' {} \; # Fix wrong /usr/bin/env python3 find . -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \; @@ -205,15 +210,13 @@ %endif %build -# need to regenerate (old one does not accept CFLAGS) -autoreconf -fi - %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/gdal \ --datadir=%{_datadir} \ --with-threads \ --disable-static \ + --without-armadillo \ --with-geotiff \ --with-libtiff \ --with-rename-internal-libtiff-symbols=yes \ @@ -226,6 +229,7 @@ --with-openjpeg \ --with-curl \ --with-pg \ + --with-pcre \ --with-ogdi \ --without-pcraster \ --with-jpeg12=no \ @@ -244,9 +248,9 @@ --with-perl \ --with-mysql \ --with-freexl \ + --without-qhull \ --with-xerces=yes \ --with-xerces-lib="-lxerces-c" \ - --with-xerces-inc=%{_includedir}/xercesc \ %if %{with ecw5_support} --with-ecw=../ECW/ \ %else @@ -261,6 +265,15 @@ --with-proj5-api=no \ CPPFLAGS="$CPPFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" \ %endif +%if %{with kml_support} + --with-kml \ +%endif +%if %{with sfcgal_support} + --with-sfcgal=%{_bindir}/sfcgal-config \ +%endif +%if %{with heif_support} + --with-heif \ +%endif --with-opencl \ --without-hdf4 \ --with-hdf5 \ @@ -320,6 +333,39 @@ # avoid PACKAGE redefines sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h +%if %{with tests_support} +%check +pushd %{name}autotest-%{version} + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} + export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/ + export PYTHONPATH=%{buildroot}%{python3_sitearch}/ + # Enable these tests on demand + #export GDAL_RUN_SLOW_TESTS=1 + #export GDAL_DOWNLOAD_TEST_DATA=1 + + # Some tests are currently skipped: + # - `test_fits_vector` because it's crashing. + # - `test_http*`, `test_jp2openjpeg_45`, `*multithreaded_download*`, + # `*multithreaded_upload*`, and `test_vsis3_no_sign_request`, which + # try to connect externally. + # - `test_eedai_GOOGLE_APPLICATION_CREDENTIALS` which seems to use the + # internet. + # - `test_osr_erm_1`, `test_ers_4`, `test_ers_8`, and `test_ers_10` as + # they use `ecw_cs.wkt` which was removed due to unclear license. + # - `test_jpeg2000_8` and `test_jpeg2000_11` as files don't load, + # perhaps due to buggy Jasper library? + # - `test_osr_ct_options_area_of_interest` returns the wrong value, but + # it's skipped on macOS by upstream for mysteriously failing as well, + # so do the same here. + # - `test_ndf_1` because it hangs on i686 and armv7hl +# FIXME: Tests hang on i686 and armv7hl +%ifnarch i686 armv7hl + pytest -k 'not test_fits_vector and not test_http and not test_jp2openjpeg_45 and not multithreaded_download and not multithreaded_upload and not test_vsis3_no_sign_request and not test_eedai_GOOGLE_APPLICATION_CREDENTIALS and not test_osr_erm_1 and not test_ers_4 and not test_ers_8 and not test_ers_10 and not test_jpeg2000_8 and not test_jpeg2000_11 and not test_osr_ct_options_area_of_interest and not test_ndf_1 and not test_cog_small_world_to_web_mercator' +#|| : +%endif +popd +%endif + %post -n lib%{name}%{soversion} -p /sbin/ldconfig %postun -n lib%{name}%{soversion} -p /sbin/ldconfig @@ -385,13 +431,9 @@ %{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man} # 20201104 We keep all binaries in gdal and requires python3-GDAL -%{_bindir}/epsg_tr.py -%{_bindir}/esri2wkt.py -%{_bindir}/gcps2vec.py -%{_bindir}/gcps2wld.py +%{_bindir}/gdalattachpct.py %{_bindir}/gdal2tiles.py %{_bindir}/gdal2xyz.py -%{_bindir}/gdal_auth.py %{_bindir}/gdal_calc.py %{_bindir}/gdal_edit.py %{_bindir}/gdal_fillnodata.py @@ -401,12 +443,8 @@ %{_bindir}/gdal_proximity.py %{_bindir}/gdal_retile.py %{_bindir}/gdal_sieve.py -%{_bindir}/gdalchksum.py %{_bindir}/gdalcompare.py -%{_bindir}/gdalident.py -%{_bindir}/gdalimport.py %{_bindir}/gdalmove.py -%{_bindir}/mkgraticule.py %{_bindir}/ogrmerge.py %{_bindir}/pct2rgb.py %{_bindir}/rgb2pct.py @@ -463,13 +501,6 @@ %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so %{_mandir}/man3/Geo::GDAL.3pm%{?ext_man} -%if %{with python2} -%files -n python2-%{pypi_package_name} -%license LICENSE.TXT -%doc NEWS PROVENANCE.TXT -%{python_sitearch}/* -%endif - %files -n python3-%{pypi_package_name} %license LICENSE.TXT %doc NEWS PROVENANCE.TXT ++++++ gdal-3.2.3.tar.xz -> gdal-3.3.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/gdal/gdal-3.2.3.tar.xz /work/SRC/openSUSE:Factory/.gdal.new.32437/gdal-3.3.0.tar.xz differ: char 27, line 1 ++++++ gdal-3.2.3.tar.xz.md5 -> gdal-3.3.0.tar.xz.md5 ++++++ --- /work/SRC/openSUSE:Factory/gdal/gdal-3.2.3.tar.xz.md5 2021-05-06 22:53:18.914579266 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.32437/gdal-3.3.0.tar.xz.md5 2021-06-14 23:11:32.148799286 +0200 @@ -1 +1 @@ -6c276978d625d23a091bac9fdddb99db gdal-3.2.3.tar.xz +000db27a7b3e146b9dcb3838aabde2ab gdal-3.3.0.tar.xz
