diff --git a/gdal-3.8.5.tar.xz b/gdal-3.8.5.tar.xz deleted file mode 100644 index bb33794..0000000 --- a/gdal-3.8.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8b4df2a8a7d25272f867455c0c230459545972f81f0eff2ddbf6a6f60dcb1e4 -size 8871404 diff --git a/gdal-3.8.5.tar.xz.md5 b/gdal-3.8.5.tar.xz.md5 deleted file mode 100644 index 256b225..0000000 --- a/gdal-3.8.5.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -70f8fec56359b23f7b5c8877a3b46626 gdal-3.8.5.tar.xz diff --git a/gdal-3.9.1.tar.xz b/gdal-3.9.1.tar.xz new file mode 100644 index 0000000..d5e2808 --- /dev/null +++ b/gdal-3.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aff3086fee75f5773e33a5598df98d8a4d10be411f777d3ce23584b21d8171ca +size 9098844 diff --git a/gdal-3.9.1.tar.xz.md5 b/gdal-3.9.1.tar.xz.md5 new file mode 100644 index 0000000..f198d53 --- /dev/null +++ b/gdal-3.9.1.tar.xz.md5 @@ -0,0 +1 @@ +f0f9bad106d938cfeb751b17a1321579 gdal-3.9.1.tar.xz diff --git a/gdal.changes b/gdal.changes index dfed7fa..09a13de 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Thu Jul 4 13:30:21 UTC 2024 - Bruno Friedmann + +- update to bugfix release 3.9.1 + https://github.com/OSGeo/gdal/blob/v3.9.1/NEWS.md +- update to version 3.9.0 + https://github.com/OSGeo/gdal/blob/v3.9.0/NEWS.md + + fix boo#1227394 compilation error with libpoppler 24.06 +- packaging: the following binaries are directly present in main gdal + /usr/bin/gdal2tiles + /usr/bin/gdal2xyz + /usr/bin/gdal_calc + /usr/bin/gdal_edit + /usr/bin/gdal_fillnodata + /usr/bin/gdal_merge + /usr/bin/gdal_pansharpen + /usr/bin/gdal_polygonize + /usr/bin/gdal_proximity + /usr/bin/gdal_retile + /usr/bin/gdal_sieve + /usr/bin/gdalattachpct + /usr/bin/gdalcompare + /usr/bin/gdalmove + /usr/bin/ogr_layer_algebra + /usr/bin/ogrmerge + /usr/bin/pct2rgb + /usr/bin/rgb2pct + Their *.py equivalent are present in python3-GDAL, so we remove + the hard dependency on python3-GDAL in gdal + + remove duplicate LICENSE.TXT file in /usr/share/gdal +- spec cleaning + ------------------------------------------------------------------- Thu Apr 4 19:22:17 UTC 2024 - Bruno Friedmann diff --git a/gdal.spec b/gdal.spec index 185e63a..de857d5 100644 --- a/gdal.spec +++ b/gdal.spec @@ -16,7 +16,7 @@ # -%define soversion 34 +%define soversion 35 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL @@ -31,7 +31,7 @@ %bcond_with deflate_support %bcond_with tests_support Name: gdal -Version: 3.8.5 +Version: 3.9.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 @@ -43,11 +43,6 @@ BuildRequires: KEALib-devel BuildRequires: bison BuildRequires: blas-devel BuildRequires: chrpath -%if %{with tests_support} -BuildRequires: cmake-full -%else -BuildRequires: cmake -%endif BuildRequires: curl-devel BuildRequires: dos2unix BuildRequires: doxygen >= 1.4.2 @@ -62,24 +57,14 @@ BuildRequires: libdeflate-devel BuildRequires: libtool BuildRequires: libzstd-devel BuildRequires: mysql-devel +# This one is needed for Leap :-( +BuildRequires: opencl-headers BuildRequires: pcre2-devel BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools -%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} -BuildRequires: python-rpm-macros -%endif -%if %{with tests_support} -BuildRequires: proj -BuildRequires: python3-lxml -BuildRequires: python3-pytest -BuildRequires: python3-pytest-env -BuildRequires: python3-pytest-sugar -%endif -# This one is needed for Leap :-( -BuildRequires: opencl-headers BuildRequires: shapelib BuildRequires: swig BuildRequires: unixODBC-devel @@ -115,6 +100,21 @@ BuildRequires: pkgconfig(spatialite) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(zlib) >= 1.1.4 +%if %{with tests_support} +BuildRequires: cmake-full +%else +BuildRequires: cmake +%endif +%if 0%{?sle_version} == 150300 && 0%{?is_opensuse} +BuildRequires: python-rpm-macros +%endif +%if %{with tests_support} +BuildRequires: proj +BuildRequires: python3-lxml +BuildRequires: python3-pytest +BuildRequires: python3-pytest-env +BuildRequires: python3-pytest-sugar +%endif %if %{with deflate_support} BuildRequires: libdeflate-devel %endif @@ -143,8 +143,8 @@ BuildRequires: ERDAS-ECW_JPEG_2000_SDK-devel BuildRequires: libecwj2-devel %endif %endif - -Requires: python3-GDAL = %{version} +# 3.9.x we stop requiring this hardly +#Requires: python3-GDAL = %%{version} %description GDAL is a translator library for raster geospatial data formats that @@ -165,8 +165,8 @@ Provides: lib%{name}-devel = %{version} Development Libraries for the GDAL file format library %package -n lib%{name}%{soversion} -Requires: lib%{name}-drivers >= %{version} Summary: GDAL static libraries +Requires: lib%{name}-drivers >= %{version} %description -n lib%{name}%{soversion} GDAL and OGR are translator libraries for raster and vector geospatial data @@ -205,7 +205,7 @@ bash command line completion support for GDAL %setup -q -n %{sourcename}-%{version} %autopatch -p1 # Prepare tests -tar -xf %{S:2} +tar -xf %{SOURCE2} # Delete bundled libraries # keep zlib due to missing frmts/zlib/contrib/infback9 in our package # rm -rv frmts/zlib @@ -302,6 +302,8 @@ find . -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/pyth %install %cmake_install %fdupes %{buildroot}%{python3_sitearch} +#remove duplicate license file +rm -f %{buildroot}%{_datadir}/%{name}/LICENSE.TXT %if %{with tests_support} %check @@ -407,25 +409,26 @@ popd %{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man} %{_mandir}/man1/sozip.1%{?ext_man} -# 20201104 We keep all binaries in gdal and requires python3-GDAL -%{_bindir}/gdalattachpct.py -%{_bindir}/gdal2tiles.py -%{_bindir}/gdal2xyz.py -%{_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}/gdalcompare.py -%{_bindir}/gdalmove.py -%{_bindir}/ogrmerge.py -%{_bindir}/ogr_layer_algebra.py -%{_bindir}/pct2rgb.py -%{_bindir}/rgb2pct.py +# 20240706 with 3.9.x release we have all binaries in gdal +# and python3-GDAL will contains the *.py equivalent. +%{_bindir}/gdalattachpct +%{_bindir}/gdal2tiles +%{_bindir}/gdal2xyz +%{_bindir}/gdal_calc +%{_bindir}/gdal_edit +%{_bindir}/gdal_fillnodata +%{_bindir}/gdal_merge +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_proximity +%{_bindir}/gdal_retile +%{_bindir}/gdal_sieve +%{_bindir}/gdalcompare +%{_bindir}/gdalmove +%{_bindir}/ogrmerge +%{_bindir}/ogr_layer_algebra +%{_bindir}/pct2rgb +%{_bindir}/rgb2pct %{_mandir}/man1/gdal2tiles.1%{?ext_man} %{_mandir}/man1/gdal_calc.1%{?ext_man} %{_mandir}/man1/gdal_edit.1%{?ext_man} @@ -462,7 +465,27 @@ popd %files -n python3-%{pypi_package_name} %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT -%{python3_sitearch}/* +%{python3_sitearch}/osgeo_utils +%{python3_sitearch}/osgeo +%{python3_sitearch}/GDAL-%{version}*-info +%{_bindir}/gdalattachpct.py +%{_bindir}/gdal2tiles.py +%{_bindir}/gdal2xyz.py +%{_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}/gdalcompare.py +%{_bindir}/gdalmove.py +%{_bindir}/ogrmerge.py +%{_bindir}/ogr_layer_algebra.py +%{_bindir}/pct2rgb.py +%{_bindir}/rgb2pct.py %files bash-completion %{_datadir}/bash-completion/completions/* diff --git a/gdalautotest-3.8.5.tar.gz b/gdalautotest-3.8.5.tar.gz deleted file mode 100644 index 758d4ea..0000000 --- a/gdalautotest-3.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7f59780659305b3b91d8a27648fd05fd34698a2ac0205f563563cf0dc432fa2 -size 15711701 diff --git a/gdalautotest-3.9.1.tar.gz b/gdalautotest-3.9.1.tar.gz new file mode 100644 index 0000000..95396be --- /dev/null +++ b/gdalautotest-3.9.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:464d79b282fd8308e618a083de112ea0befb00b11fadb2acc4818f82f004f7a2 +size 16681261