Merge branch 'pyhton2-saga' of dani/copr-dani-qgis into daniviga-2.18

saga/saga.spec

@@ -1,6 +1,6 @@
 Name:           saga
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Geographic information system with an API for processing geodata 
 
 Group:          Applications/Engineering
@@ -37,12 +37,17 @@ SAGA is a geographic information system (GIS) with a special API
 for geographic data processing. This API makes it easy to implement
 new algorithms. The SAGA API supports grid data, vector data, and tables. 
 
-%package python
+%package -n python2-saga
+%{?python_provide:%python_provide python2-saga}
+# Remove before F30
+Provides: %{name}-python = %{version}-%{release}
+Provides: %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        SAGA Python interface
 Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description python
+%description -n python2-saga
 Python interface for SAGA
 
 %package devel
@@ -126,7 +131,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_mandir}/man1/%{name}_*1*
 
-%files python
+%files -n python2-saga
 %{python_sitearch}/*.py*
 %{python_sitearch}/*.so
 
@@ -140,6 +145,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
 
 
 %changelog
+* Tue Aug 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-2
+- Sync with upstream master
+- Python 2 binary package renamed to python2-saga
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
 * Thu Jun 29 2017 Daniele Viganò <daniele@vigano.me> - 2.3.1-1
 - Update to SAGA 2.3.1 (with some non-free components disabled)