From c50785bbcff47c144fff8377583b7f19b6e0cce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Mon, 26 Jun 2017 15:14:39 +0200 Subject: [PATCH 1/3] Update to 2.18.10 --- .gitignore | 1 + qgis.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c772a22..e48884a 100644 --- a/.gitignore +++ b/.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 diff --git a/qgis.spec b/qgis.spec index ab9d447..1df7239 100644 --- a/qgis.spec +++ b/qgis.spec @@ -18,7 +18,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.9 +Version: 2.18.10 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -417,6 +417,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jun 26 2017 Daniele Viganò - 2.18.10-1 +- New upstream release + * Mon May 29 2017 Daniele Viganò - 2.18.9-1 - New upstream release diff --git a/sources b/sources index 99a64c5..6b628a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.9.tar.bz2) = 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 +SHA512 (qgis-2.18.10.tar.bz2) = 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 From af86e34bfbc0414735fd3f4317af18814d078810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Mon, 26 Jun 2017 15:15:38 +0200 Subject: [PATCH 2/3] Fix an issue in the QGIS server httpd configuration --- qgis-server-httpd.conf | 2 +- qgis.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qgis-server-httpd.conf b/qgis-server-httpd.conf index ce4e4bc..39866c1 100644 --- a/qgis-server-httpd.conf +++ b/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/" diff --git a/qgis.spec b/qgis.spec index 1df7239..1ffc14d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -418,6 +418,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog * Mon Jun 26 2017 Daniele Viganò - 2.18.10-1 +- Fix an issue in the QGIS server httpd configuration - New upstream release * Mon May 29 2017 Daniele Viganò - 2.18.9-1 From 44cfc3ff15a945b92b1fde7062e9aa2a29594263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Mon, 26 Jun 2017 16:19:24 +0200 Subject: [PATCH 3/3] Limit maximum number of concurrent make --- qgis.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index 1ffc14d..d3d4610 100644 --- a/qgis.spec +++ b/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 +# ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +%if %(grep -c processor /proc/cpuinfo) > 4 +%_smp_mflags -j4 +%endif + # Shared lib calls exit # https://hub.qgis.org/issues/2854 @@ -19,7 +27,7 @@ Name: qgis Version: 2.18.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -417,6 +425,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jun 26 2017 Daniele Viganò - 2.18.10-2 +- Limit maximum number of concurrent make + * Mon Jun 26 2017 Daniele Viganò - 2.18.10-1 - Fix an issue in the QGIS server httpd configuration - New upstream release