Synch with upstream and rebuild for F26 GA #10

Merged
dani merged 16 commits from daniviga-2.18-sync into daniviga-2.18 2017-07-18 11:29:41 +02:00
Showing only changes of commit 29df9e04b3 - Show all commits

View File

@ -16,7 +16,7 @@
Name: qgis Name: qgis
Version: 2.18.10 Version: 2.18.10
Release: 1%{?dist} Release: 2%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -243,7 +243,10 @@ gzip ChangeLog
# Doesn't build, as of 2.10, known issue # Doesn't build, as of 2.10, known issue
#-D WITH_GLOBE:BOOL=TRUE #-D WITH_GLOBE:BOOL=TRUE
make %{?_smp_mflags} # Parallel build appears to occasionally result in build failures
# (UI form headers generated too late)
# TODO: Re-check with QGIS-3.0
make
%install %install
@ -406,6 +409,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Mon Jun 26 2017 Sandro Mani <manisandro@gmail.com> - 2.18.10-2
- Disable parallel build for now to avoid build failures
* Sat Jun 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-1 * Sat Jun 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.10-1
- New upstream release - New upstream release