From 5306bfcea0409b723a2be8e504c43643ed169df1722ed6329c06d656d20fd3e9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 25 Feb 2019 07:58:09 +0000 Subject: [PATCH] Accepting request 678361 from home:jayvdb:django - Use the Python package name 'GDAL' as used by upstream OBS-URL: https://build.opensuse.org/request/show/678361 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=84 --- gdal.changes | 5 +++++ gdal.spec | 22 +++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gdal.changes b/gdal.changes index 44279ea..1d69cc3 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 23 01:35:04 UTC 2019 - John Vandenberg + +- Use the Python package name 'GDAL' as used by upstream + ------------------------------------------------------------------- Wed Jan 30 19:51:14 UTC 2019 - Wolfgang Bauer diff --git a/gdal.spec b/gdal.spec index 9baa16c..9021b97 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,7 +1,7 @@ # # spec file for package gdal # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,6 +20,8 @@ # http://trac.osgeo.org/gdal/ticket/4543 %define soversion 20 %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 @@ -152,21 +154,27 @@ Requires: perl = %{perl_version} %description -n perl-%{name} Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules. -%package -n python-%{name} +%package -n python2-%{pypi_package_name} Summary: GDAL Python module Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} +# Renaming to uppercase 'GDAL' during 2.4.0; previously used lowercase Provides: python2-%{name} = %{version} +Obsoletes: python2-%{name} +Provides: python-%{name} = %{version} +Obsoletes: python-%{name} -%description -n python-%{name} +%description -n python2-%{pypi_package_name} The GDAL python modules provide support to handle multiple GIS file formats. -%package -n python3-%{name} +%package -n python3-%{pypi_package_name} Summary: GDAL Python3 module Group: Development/Languages/Python Requires: %{name} = %{version}-%{release} +Provides: python3-%{name} = %{version} +Obsoletes: python3-%{name} -%description -n python3-%{name} +%description -n python3-%{pypi_package_name} The GDAL python modules provide support to handle multiple GIS file formats. %prep @@ -480,13 +488,13 @@ sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_ %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so %{_mandir}/man3/Geo::GDAL.3pm%{?ext_man} -%files -n python-%{name} +%files -n python2-%{pypi_package_name} %defattr(644,root,root,755) %license LICENSE.TXT %doc NEWS PROVENANCE.TXT %{python_sitearch}/* -%files -n python3-%{name} +%files -n python3-%{pypi_package_name} %defattr(644,root,root,755) %license LICENSE.TXT %doc NEWS PROVENANCE.TXT