pool/gdal
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1038230 from home:Guillaume_G:branches:Application:Geo

Browse Source 
- Set bash-completion as noarch

- Update to 3.6.0:
  * https://github.com/OSGeo/gdal/blob/v3.6.0/gdal/NEWS.md
  * Fixes boo#1205745
- Skipped 3.5.0:
  * https://github.com/OSGeo/gdal/blob/v3.5.0/gdal/NEWS.md
  * Upstream dropped deprecated perl binding
  * Drop unneeded patch:
    - gdal-perl.patch

OBS-URL: https://build.opensuse.org/request/show/1038230
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=158
This commit is contained in:
Bruno Friedmann 2022-11-25 16:51:06 +00:00 committed by Git OBS Bridge
parent b8a9ccb569
commit 43e34f8822
9 changed files with 98 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdal-3.4.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16baf03dfccf9e3f72bb2e15cd2d5b3f4be0437cdff8a785bceab0c7be557335
size 13273280

1
gdal-3.4.2.tar.xz.md5
View File

@ -1 +0,0 @@
4b6ac60068a60059a31e125b2a169d86 gdal-3.4.2.tar.xz

3
gdal-3.6.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7afa4aa8d32d0799e011a9f573c6a67e9471f78e70d3d0d0b45b45c8c0c1a94
size 8677916

1
gdal-3.6.0.tar.xz.md5 Normal file
View File

@ -0,0 +1 @@
7ca9e31b12a26d69a3909af5c9a0a883 gdal-3.6.0.tar.xz

24
gdal-perl.patch
View File

@ -1,24 +0,0 @@
diff -purN gdal-2.4.0.orig/swig/perl/GNUmakefile gdal-2.4.0/swig/perl/GNUmakefile
--- gdal-2.4.0.orig/swig/perl/GNUmakefile 2018-12-14 22:34:20.000000000 +0100
+++ gdal-2.4.0/swig/perl/GNUmakefile 2018-12-21 17:37:59.897136465 +0100
@@ -28,7 +28,7 @@ build: Makefile_Geo__GDAL
if [ -f Makefile_Geo__GNM ]; then $(MAKE) -f Makefile_Geo__GNM; fi
Makefile_Geo__GDAL: ${WRAPPERS} Makefile.PL
- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL INSTALLDIRS=vendor
test: build
$(MAKE) -f Makefile_Geo__GDAL test
diff -purN gdal-2.4.0.orig/swig/perl/Makefile gdal-2.4.0/swig/perl/Makefile
--- gdal-2.4.0.orig/swig/perl/Makefile 2018-12-14 22:34:20.000000000 +0100
+++ gdal-2.4.0/swig/perl/Makefile 2018-12-21 17:37:45.553036952 +0100
@@ -7,7 +7,7 @@ build: Makefile_Geo__GDAL
$(MAKE) -f Makefile_Geo__OSR
Makefile_Geo__GDAL:
- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL INSTALLDIRS=vendor
test: build
$(MAKE) -f Makefile_Geo__GDAL test

17
gdal.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Nov 25 14:57:59 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Set bash-completion as noarch
-------------------------------------------------------------------
Fri Nov 25 11:11:55 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Update to 3.6.0:
* https://github.com/OSGeo/gdal/blob/v3.6.0/gdal/NEWS.md
* Fixes boo#1205745
- Skipped 3.5.0:
* https://github.com/OSGeo/gdal/blob/v3.5.0/gdal/NEWS.md
* Upstream dropped deprecated perl binding
* Drop unneeded patch:
- gdal-perl.patch
-------------------------------------------------------------------
Tue Mar 15 19:33:40 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch>

258
gdal.spec
View File

@ -16,7 +16,7 @@
#
%define soversion 30
%define soversion 32
%define sourcename gdal
# Uppercase GDAL is the canonical name for this package in Python
%define pypi_package_name GDAL
@ -29,7 +29,7 @@
%bcond_with heif_support
%bcond_with tests_support
Name: gdal
Version: 3.4.2
Version: 3.6.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
@ -37,13 +37,11 @@ URL: https://www.gdal.org/
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
#PATCH-FIX-OPENSUSE set proper perl install directories
Patch0: gdal-perl.patch
BuildRequires: KEALib-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bash-completion
BuildRequires: blas-devel
BuildRequires: chrpath
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: dos2unix
BuildRequires: doxygen >= 1.4.2
@ -57,8 +55,6 @@ BuildRequires: libtool
BuildRequires: libzstd-devel
BuildRequires: mysql-devel
BuildRequires: opencl-headers
BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-macros
BuildRequires: pkgconfig
BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools
@ -151,15 +147,6 @@ GDAL and OGR are translator libraries for raster and vector geospatial data
formats. As a library, it presents a single abstract data model to the calling
application for all supported formats.
%package -n perl-%{name}
Summary: Perl bindings for GDAL
Requires: %{name} = %{version}-%{release}
%{perl_requires}
%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
Requires: %{name} = %{version}-%{release}
@ -169,6 +156,17 @@ Obsoletes: python3-%{name} < %{version}
%description -n python3-%{pypi_package_name}
The GDAL python modules provide support to handle multiple GIS file formats.
%package bash-completion
Summary: Bash completion for GDAL
Group: System/Shells
Requires: %{name}
Requires: bash-completion
Supplements: (%{name} and bash-completion)
BuildArch: noarch
%description bash-completion
bash command line completion support for GDAL
%prep
%setup -q -n %{sourcename}-%{version}
%autopatch -p1
@ -184,18 +182,6 @@ 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}')
sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp
# --keep-going option not support on Leap/SLE
%if 0%{?sle_version} && 0%{?sle_version} <= 150200
sed -i 's/--keep-going//' doc/Makefile
%endif
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
# Fix wrong encoding EOL
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 {} \;
@ -207,147 +193,65 @@ find swig/python/gdal-utils/osgeo_utils -iname '*.py' -ls -exec sed -i '/^#!\/us
# Fix wrong /usr/bin/env python3
find . -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \;
%if %{with ecw5_support}
# gdal configure script looks for a given layout, so reproduce what is expected.
export ECW_PATH="../ECW/Desktop_Read-Only"
export ECW_LIB_PATH="$ECW_PATH/lib/cpp11abi/x64/release"
export ECW_INC_PATH="$ECW_PATH/include"
mkdir -p $ECW_PATH/lib/cpp11abi/x64/
ln -s %{_libdir} $ECW_LIB_PATH
ln -s %{_includedir} $ECW_INC_PATH
%endif
%build
./autogen.sh
%configure \
--prefix=%{_prefix} \
--includedir=%{_includedir}/gdal \
--datadir=%{_datadir} \
--with-threads \
--disable-static \
--without-armadillo \
--with-geotiff \
--with-libtiff \
--with-rename-internal-libtiff-symbols=yes \
--with-rename-internal-libgeotiff-symbols=yes \
--with-libz \
--with-liblzma \
--with-cfitsio=no \
--with-kea=yes \
--with-netcdf \
--with-openjpeg \
--with-curl \
--with-pg \
--with-pcre \
--with-ogdi \
--without-pcraster \
--with-jpeg12=no \
--without-libgrass \
--without-grass \
--enable-shared \
--with-geos \
--with-expat \
--without-jasper \
--with-png \
--with-gif \
--with-jpeg \
--with-spatialite \
--with-poppler \
--with-python \
--with-perl \
--with-mysql \
--with-freexl \
--without-qhull \
--with-xerces=yes \
--with-xerces-inc=%{_includedir} \
--with-xerces-lib="-lxerces-c" \
%cmake \
%if %{with ecw5_support}
--with-ecw=../ECW/ \
%else
%if %{with ecw_support}
--with-ecw \
CFLAGS="$CFLAGS -pthread" \
-DECW_ROOT="../ECW/Desktop_Read-Only" \
%endif
%endif
%if %{with fgdb_support}
--with-fgdb \
--with-static-proj4 \
--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 \
-DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
-DGDAL_USE_ARMADILLO=OFF \
-DGDAL_USE_CFITSIO=OFF \
-DGDAL_USE_CURL=ON \
-DGDAL_USE_EXPAT=ON \
-DGDAL_USE_FREEXL=ON \
-DGDAL_USE_GEOS=ON \
-DGDAL_USE_GIF=ON \
%if %{with hdf4_support}
--with-hdf4 \
-DGDAL_USE_HDF4=ON \
%else
-DGDAL_USE_HDF4=OFF \
%endif
--with-webp \
--disable-rpath \
--enable-lto
# regenerate where needed
for M in perl python;
do
make %{?_smp_mflags} -C swig/${M} veryclean
make %{?_smp_mflags} -C swig/${M} generate
done
# Workaround incomplete ordering in Makefile
%make_build lib-dependencies
%make_build all
# Make Python 3 module
pushd swig/python
python3 setup.py build
popd
-DGDAL_USE_HDF5=ON \
%if %{with heif_support}
-DGDAL_USE_HEIF=ON \
%else
-DGDAL_USE_HEIF=OFF \
%endif
-DGDAL_USE_JPEG=ON \
-DGDAL_USE_JPEG12_INTERNAL=OFF \
-DGDAL_USE_KEA=ON \
%if %{with kml_support}
-DGDAL_USE_LIBKML=ON \
%else
-DGDAL_USE_LIBKML=OFF \
%endif
-DGDAL_USE_LIBLZMA=ON \
-DGDAL_USE_MYSQL=ON \
-DGDAL_USE_NETCDF=ON \
-DGDAL_USE_OGDI=OFF \
-DGDAL_USE_OPENCL=ON \
-DGDAL_USE_OPENJPEG=ON \
-DGDAL_USE_PCRE=ON \
-DGDAL_USE_PCRE2=OFF \
-DGDAL_USE_PNG=ON \
-DGDAL_USE_POPPLER=ON \
-DGDAL_USE_POSTGRESQL=ON \
-DGDAL_USE_QHULL=OFF \
%if %{with sfcgal_support}
-DGDAL_USE_SFCGAL=ON \
%else
-DGDAL_USE_SFCGAL=OFF \
%endif
-DGDAL_USE_SPATIALITE=ON \
-DGDAL_USE_TIFF=ON \
-DGDAL_USE_WEBP=ON \
-DGDAL_USE_XERCESC=ON
%cmake_build
%install
# Install Python 3 module
# Must be done first so executables are env python
pushd swig/python
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
popd
# Don't even think to make it smp_mflags if you want successful build!
make V=1 install install-man DESTDIR=%{buildroot} INST_MAN=%{_mandir}
# chrpath must be removed here
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so
chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so
chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so
# do not ship those
rm -rf %{buildroot}%{_mandir}/man1/_*
rm -rf %{buildroot}%{_libdir}/libgdal.la
rm -rf %{buildroot}%{perl_archlib}/perllocal.pod
rm -rf %{buildroot}%{perl_vendorarch}/auto/Geo/*/.packlist
rm -rf %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/.packlist
rm -rf %{buildroot}%{_bindir}/*.dox
# License doesn't go there
rm -f %{buildroot}%{_datadir}/gdal/LICENSE.TXT
%cmake_install
%fdupes %{buildroot}%{python3_sitearch}
# avoid PACKAGE redefines
sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h
%if %{with tests_support}
%check
pushd %{name}autotest-%{version}
@ -389,6 +293,8 @@ popd
%license LICENSE.TXT
%{_libdir}/*.so.%{soversion}.*
%{_libdir}/*.so.%{soversion}
%dir %{_libdir}/gdalplugins
%{_libdir}/gdalplugins/drivers.ini
%files
%license LICENSE.TXT
@ -460,6 +366,7 @@ popd
%{_bindir}/gdalcompare.py
%{_bindir}/gdalmove.py
%{_bindir}/ogrmerge.py
%{_bindir}/ogr_layer_algebra.py
%{_bindir}/pct2rgb.py
%{_bindir}/rgb2pct.py
%{_mandir}/man1/gdal2tiles.1%{?ext_man}
@ -476,6 +383,7 @@ popd
%{_mandir}/man1/gdalcompare.1%{?ext_man}
%{_mandir}/man1/gdalmove.1%{?ext_man}
%{_mandir}/man1/ogrmerge.1%{?ext_man}
%{_mandir}/man1/ogr_layer_algebra.1%{?ext_man}
%{_mandir}/man1/pct2rgb.1%{?ext_man}
%{_mandir}/man1/rgb2pct.1%{?ext_man}
@ -486,38 +394,20 @@ popd
%doc doc/build/html/
%endif
%attr(755,root,root) %{_bindir}/gdal-config
%dir %{_libdir}/cmake/gdal
%{_libdir}/cmake/gdal/*.cmake
%{_libdir}/libgdal.so
%{_libdir}/pkgconfig/gdal.pc
%dir %{_includedir}/gdal
%{_includedir}/gdal/*.h
%{_mandir}/man1/gdal-config.1%{?ext_man}
%files -n perl-%{name}
%license LICENSE.TXT
%doc NEWS.md PROVENANCE.TXT
%{perl_vendorarch}/Geo/GDAL.pm
%dir %{perl_vendorarch}/Geo/GDAL
%{perl_vendorarch}/Geo/GDAL/Const.pm
%{perl_vendorarch}/Geo/GNM.pm
%{perl_vendorarch}/Geo/OGR.pm
%{perl_vendorarch}/Geo/OSR.pm
%dir %{perl_vendorarch}/Geo
%dir %{perl_vendorarch}/auto/Geo
%dir %{perl_vendorarch}/auto/Geo/GDAL
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
%dir %{perl_vendorarch}/auto/Geo/GDAL/Const
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
%dir %{perl_vendorarch}/auto/Geo/GNM
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GNM/GNM.so
%dir %{perl_vendorarch}/auto/Geo/OGR
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so
%dir %{perl_vendorarch}/auto/Geo/OSR
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
%{_mandir}/man3/Geo::GDAL.3pm%{?ext_man}
%files -n python3-%{pypi_package_name}
%license LICENSE.TXT
%doc NEWS.md PROVENANCE.TXT
%{python3_sitearch}/*
%files bash-completion
%{_datadir}/bash-completion/completions/*
%changelog

3
gdalautotest-3.4.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95b8abd697fb0576b8a6dc009fed6a557944c3a5869bc218722541c19f52bff9
size 49571840

3
gdalautotest-3.6.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4821d4be8c34badd3a01685bba7abbd18299ca61d5ed11fff12015fe7ba8ebf
size 12568383