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

.gitignore

@@ -8,3 +8,4 @@
 /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-server-httpd.conf

@@ -2,7 +2,7 @@
 # It is not meant for productive use.
 
 RewriteEngine on
-RewriteRule ^/wms/(.+)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
+RewriteRule ^/wms/(.*)$ /qgis/qgis_mapserv.fcgi?map=/var/www/wms/$1.qgs [QSA,PT]
 
 ScriptAlias /qgis/ "/usr/libexec/qgis/"
 

qgis.spec

@@ -1,5 +1,13 @@
 #TODO: Fix error message with processing plug-in in regards to pyspatialite
 
+# Limit the number of concurrent make to avoid failures due races:
+# qgsprojectionselector.h:14:10: fatal error: ui_qgsprojectionselectorbase.h: No such file or directory
+# #include <ui_qgsprojectionselectorbase.h>
+#          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+%if %(grep -c processor /proc/cpuinfo) > 4
+%_smp_mflags -j4
+%endif
+
 # Shared lib calls exit
 # https://hub.qgis.org/issues/2854
 
@@ -18,8 +26,8 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.9
-Release:        1%{?dist}
+Version:        2.18.10
+Release:        2%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -417,6 +425,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-2
+- Limit maximum number of concurrent make
+
+* Mon Jun 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.10-1
+- Fix an issue in the QGIS server httpd configuration
+- New upstream release
+
 * Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 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