Accepting request 795702 from home:scarabeus_iv:branches:Application:Geo

- Fix build without py2 available

OBS-URL: https://build.opensuse.org/request/show/795702
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=114
This commit is contained in:
Martin Pluskal 2020-04-20 08:37:47 +00:00 committed by Git OBS Bridge
parent 41ad9ecb37
commit ec5971c638
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 20 08:31:33 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- Fix build without py2 available
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 17 09:58:35 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org> Fri Apr 17 09:58:35 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -25,6 +25,7 @@
%bcond_with ecw_support %bcond_with ecw_support
%bcond_with ecw5_support %bcond_with ecw5_support
%bcond_with fgdb_support %bcond_with fgdb_support
%bcond_without python2
Name: gdal Name: gdal
Version: 3.0.4 Version: 3.0.4
Release: 0 Release: 0
@ -60,8 +61,10 @@ BuildRequires: opencl-headers
BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-macros BuildRequires: perl-macros
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if %{with python2}
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
%endif
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: swig BuildRequires: swig
@ -449,10 +452,12 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_
%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
%{_mandir}/man3/Geo::GDAL.3pm%{?ext_man} %{_mandir}/man3/Geo::GDAL.3pm%{?ext_man}
%if %{with python2}
%files -n python2-%{pypi_package_name} %files -n python2-%{pypi_package_name}
%license LICENSE.TXT %license LICENSE.TXT
%doc NEWS PROVENANCE.TXT %doc NEWS PROVENANCE.TXT
%{python_sitearch}/* %{python_sitearch}/*
%endif
%files -n python3-%{pypi_package_name} %files -n python3-%{pypi_package_name}
%license LICENSE.TXT %license LICENSE.TXT