Fix PYTHON detection in SAGA

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -1,17 +1,8 @@
-/qgis-2.18.0.tar.bz2
-/qgis-2.18.1.tar.bz2
-/qgis-2.18.2.tar.bz2
-/qgis-2.18.3.tar.bz2
-/qgis-2.18.4.tar.bz2
-/qgis-2.18.5.tar.bz2
-/qgis-2.18.6.tar.bz2
-/qgis-2.18.7.tar.bz2
-/qgis-2.18.8.tar.bz2
-/qgis-2.18.9.tar.bz2
-/qgis-2.18.10.tar.bz2
-/qgis-2.18.11.tar.bz2
-/qgis-2.18.12.tar.bz2
-/qgis-2.18.13.tar.bz2
-/qgis-2.18.14.tar.bz2
-/qgis-2.18.15.tar.bz2
-/qgis-2.18.16.tar.bz2
+/qgis-2.18.17.tar.bz2
+/qgis-2.18.18.tar.bz2
+/qgis-2.18.19.tar.bz2
+/qgis-2.18.20.tar.bz2
+/qgis-2.18.21.tar.bz2
+/qgis-2.18.22.tar.bz2
+/qgis-2.18.23.tar.bz2
+/qgis-2.18.24.tar.bz2

qgis.spec

@@ -11,13 +11,18 @@
 %endif
 %endif
 
+%if 0%{?fedora} >= 27
+%define grass grass74
+%else
+%define grass grass72
+%endif
+
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.16
-Release:        2%{?dist}
+Version:        2.18.25
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
-Group:          Applications/Engineering
 
 # http://hub.qgis.org/issues/3789
 License:        GPLv3+ with exceptions
@@ -36,7 +41,6 @@ Source4:        %{name}-server-README.fedora
 Source5:        %{name}-mime.xml
 # Fix builds on 64-bit machines
 # https://hub.qgis.org/issues/15602
-# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
 Patch0:         %{name}-lib64.patch
 
 # Some plug-ins need Pyspatialite (bundled)
@@ -79,7 +83,7 @@ BuildRequires:  qextserialport-devel
 BuildRequires:  qjson-devel
 BuildRequires:  qscintilla-devel
 BuildRequires:  qscintilla-python
-BuildRequires:  qscintilla-python-devel
+BuildRequires:  qscintilla-python2-devel
 BuildRequires:  qt4-devel
 #BuildRequires:  qt-mobility-devel
 BuildRequires:  qt4-webkit-devel
@@ -123,7 +127,6 @@ and USGS ASCII DEM.
 
 %package devel
 Summary:        Development Libraries for the QGIS
-Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -131,7 +134,6 @@ Development packages for QGIS including the C header files.
 
 %package grass
 Summary:        GRASS Support Libraries for QGIS
-Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 # The plug-in requires more than just the grass-libs.
@@ -151,7 +153,6 @@ Provides: %{name}-python = %{version}-%{release}
 Provides: %{name}-python%{?_isa} = %{version}-%{release}
 Obsoletes: %{name}-python < %{version}-%{release}
 Summary:        Python integration and plug-ins for QGIS
-Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       gdal-python
 Requires:       PyQt4-webkit
@@ -171,7 +172,6 @@ Python integration and plug-ins for QGIS.
 
 %package server
 Summary:        FCGI-based OGC web map server
-Group:          Applications/Engineering
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       mod_fcgid
 Provides: mapserver = %{version}-%{release}
@@ -221,9 +221,8 @@ gzip ChangeLog
       -D QGIS_MANUAL_SUBDIR=/share/man \
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
-      -D WITH_GRASS:BOOL=TRUE \
       -D WITH_GRASS7:BOOL=TRUE \
-      -D GRASS_PREFIX=%{_libdir}/grass-7.4.0 \
+      -D GRASS_PREFIX7=%{_libdir}/%{grass} \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D ENABLE_TESTS:BOOL=FALSE \
@@ -398,8 +397,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %files -n python2-qgis
 %{_libdir}/libqgispython.so.*
 %{_datadir}/%{name}/python/
-%{python_sitearch}/%{name}/
-%{python_sitearch}/PyQt4/uic/widget-plugins/
+%{python2_sitearch}/%{name}/
+%{python2_sitearch}/PyQt4/uic/widget-plugins/
 %exclude %{python_sitearch}/%{name}/server/
 %exclude %{python_sitearch}/%{name}/_server.so
 
@@ -408,14 +407,44 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
 %{_libdir}/lib%{name}_server.so.*
 %{_libexecdir}/%{name}/
-%{python_sitearch}/%{name}/server/
-%{python_sitearch}/%{name}/_server.so
+%{python2_sitearch}/%{name}/server/
+%{python2_sitearch}/%{name}/_server.so
 
 
 %changelog
-* Wed Jan 31 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-2
+* Thu Nov 8 2018 Daniele Viganò <daniele@vigano.me> - 2.18.25-1
+- New upstream release
+
+* Thu Nov 8 2018 Daniele Viganò <daniele@vigano.me> - 2.18.24-2
+- Sync with upstream
+
+* Sat Sep 15 2018 Daniele Viganò <daniele@vigano.me> - 2.18.24-1
+- New upstream release
+
+* Fri Aug 17 2018 Daniele Viganò <daniele@vigano.me> - 2.18.23-1
+- New upstream release
+
+* Sun Jul 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.22-1
+- New upstream release
+
+* Fri Jun 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.21-1
+- New upstream release
+
+* Mon May 21 2018 Daniele Viganò <daniele@vigano.me> - 2.18.20-1
+- New upstream release
+
+* Fri Apr 27 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-2
 - Rebuild for GRASS 7.4
 
+* Mon Apr 23 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-1
+- New upstream release
+
+* Sat Mar 24 2018 Daniele Viganò <daniele@vigano.me> - 2.18.18-1
+- New upstream release
+
+* Wed Feb 28 2018 Daniele Viganò <daniele@vigano.me> - 2.18.17-1
+- New upstream release
+
 * Mon Jan 22 2018 Daniele Viganò <daniele@vigano.me> - 2.18.16-1
 - New upstream release
 

saga/saga.spec

@@ -1,6 +1,6 @@
 Name:           saga
 Version:        2.3.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Geographic information system with an API for processing geodata 
 
 Group:          Applications/Engineering
@@ -15,6 +15,7 @@ Source0:        %{name}_%{version}_gpl2.tar.gz
 Patch0:         %{name}-projections-gcc6.patch
 Patch1:         %{name}-spelling-errors.patch
 
+BuildRequires: gcc-c++
 BuildRequires: libappstream-glib
 BuildRequires: desktop-file-utils
 BuildRequires: libtool automake autoconf
@@ -65,8 +66,8 @@ This package includes the headers and development libraries for SAGA.
 # See https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Usage and https://fedorahosted.org/fpc/ticket/76
 #TODO: Check if provides are proper
 
-%global __provides_exclude_from ^%{python_sitearch}/.*\.so$
-%global __provides_requires_from ^%{python_sitearch}/.*\.so$
+%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$
+%global __provides_requires_from ^%{python2_sitearch}/.*\.so$
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -85,6 +86,7 @@ sed -i -e 's,qhull/qhull_a.h,libqhull/qhull_a.h,' \
 %endif
 
 %build
+export PYTHON=python2.7
 # wxGTK3 3.0.1-3 moved wx-config to libexecdir
 PATH=$PATH:%{_libexecdir}/wxGTK3/
 autoreconf -fi
@@ -114,7 +116,7 @@ make install DESTDIR=%{buildroot}
 # Drop libtool archives
 rm -rf %{buildroot}/%{_libdir}/saga/lib*.la     \
      %{buildroot}/%{_libdir}/saga/libsaga_*.la
-rm -rf %{buildroot}/%{python_sitearch}/*.la     \
+rm -rf %{buildroot}/%{python2_sitearch}/*.la     \
      %{buildroot}/%{_libdir}/*.la
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
@@ -150,6 +152,12 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.a
 
 
 %changelog
+* Wed Nov 7 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-5
+- Make package compatible with F29
+
+* Fri May 25 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-4
+- Make package compatible with F28
+
 * Thu Jan 18 2018 Daniele Viganò <daniele@vigano.me> - 2.3.1-3
 - Add from Debian to address segfaults with shapefiles and newer GCC
 - Add a patch from Debian to fix spelling

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.16.tar.bz2) = 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
+SHA512 (qgis-2.18.24.tar.bz2) = 2783dda3ef0c786c1f0c703482d96cc26a93f6dd75decd550bb49a525fd3ad36bcb4a9cd7ed5988176fba0a7fbd36c6c2ec293ebd63597919f43585a77776942