dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

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

Browse Source
This commit is contained in:
Daniele Viganò 2017-06-26 19:06:53 +00:00 committed by Gogs
commit ae8c708993
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/qgis-2.18.7.tar.bz2 /qgis-2.18.7.tar.bz2
/qgis-2.18.8.tar.bz2 /qgis-2.18.8.tar.bz2
/qgis-2.18.9.tar.bz2 /qgis-2.18.9.tar.bz2
/qgis-2.18.10.tar.bz2

2
qgis-server-httpd.conf
View File

@ -2,7 +2,7 @@
# It is not meant for productive use. # It is not meant for productive use.
RewriteEngine on 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/" ScriptAlias /qgis/ "/usr/libexec/qgis/"

19
qgis.spec
View File

@ -1,5 +1,13 @@
#TODO: Fix error message with processing plug-in in regards to pyspatialite #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 # Shared lib calls exit
# https://hub.qgis.org/issues/2854 # https://hub.qgis.org/issues/2854
@ -18,8 +26,8 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis 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 Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -417,6 +425,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %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 * Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 2.18.9-1
- New upstream release - New upstream release

2
sources
View File

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