Merge branch 'master' into f26

.gitignore

@@ -34,3 +34,4 @@ qgis_1.5.0.tar.gz
 /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.spec

@@ -15,8 +15,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.9
+Version:        2.18.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -243,7 +243,10 @@ gzip ChangeLog
       # Doesn't build, as of 2.10, known issue
       #-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
@@ -406,6 +409,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %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
+- New upstream release
+
 * Wed May 31 2017 Volker Froehlich <volker27@gmx.at> - 2.18.9-1
 - New upstream release
 

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.9.tar.bz2) = 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4
+SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8