diff --git a/qgis-2.18.3.tar.bz2 b/qgis-2.18.3.tar.bz2 deleted file mode 100644 index acbf809..0000000 --- a/qgis-2.18.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97e374b1a3c330a5e5cfd7cd6ee75414e5a96aaee4ef2568ab753660975d372b -size 92523924 diff --git a/qgis-2.18.4.tar.bz2 b/qgis-2.18.4.tar.bz2 new file mode 100644 index 0000000..c3ff91d --- /dev/null +++ b/qgis-2.18.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94167cdf80b1b7afa726d5dc83617e96e17d5d7ed747053f4227276ed701fc28 +size 94847872 diff --git a/qgis.changes b/qgis.changes index f0cbe47..0a8c75b 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 27 12:52:57 UTC 2017 - nrochard@gmail.com + +- Update to 2.18.4 + ------------------------------------------------------------------- Wed Jan 18 10:32:58 UTC 2017 - nrochard@gmail.com diff --git a/qgis.desktop b/qgis.desktop index 424aa53..1d63686 100644 --- a/qgis.desktop +++ b/qgis.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=QGIS 2.18.3 (Las Palmas) +Name=QGIS 2.18.4 (Las Palmas) GenericName=Geographic Information System Comment= Exec=qgis diff --git a/qgis.spec b/qgis.spec index 6e9f0a0..55acb77 100644 --- a/qgis.spec +++ b/qgis.spec @@ -17,7 +17,7 @@ Name: qgis -Version: 2.18.3 +Version: 2.18.4 Release: 0 Summary: QGIS is a Geographic Information System (GIS) License: GPL-2.0 @@ -27,8 +27,6 @@ Source: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop Source2: %{name}.rpmlintrc Source3: qgis_sample_data.zip -# Upstream fix for build bug with qt -Patch0: upstream-2c43568-qt_bug.patch BuildRequires: sqlite-devel >= 3.5 BuildRequires: fdupes BuildRequires: python-wxWidgets @@ -126,7 +124,6 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A %prep %setup -q -%patch0 -p1 %build export CFLAGS="%{optflags}" diff --git a/upstream-2c43568-qt_bug.patch b/upstream-2c43568-qt_bug.patch deleted file mode 100644 index 623a5c5..0000000 --- a/upstream-2c43568-qt_bug.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 77b8c3d67b868024e31120a38e3df9c0583e90bd Mon Sep 17 00:00:00 2001 -From: "Juergen E. Fischer" -Date: Fri, 13 Jan 2017 15:54:27 +0100 -Subject: [PATCH] fix 2c43568 - ---- - src/server/qgsserver.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp -index 6758f036..4f51aa0 100644 ---- a/src/server/qgsserver.cpp -+++ b/src/server/qgsserver.cpp -@@ -202,18 +202,18 @@ void QgsServer::printRequestParameters( const QMap< QString, QString>& parameter - */ - void QgsServer::printRequestInfos() - { -- QgsMessageLog::logMessage( QStringLiteral( "******************** New request ***************" ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "******************** New request ***************", "Server", QgsMessageLog::INFO ); - if ( getenv( "REMOTE_ADDR" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_HOST" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_USER" ) ) - { -- QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), "Server", QgsMessageLog::INFO ); - } - if ( getenv( "REMOTE_IDENT" ) ) - { -@@ -245,7 +245,7 @@ void QgsServer::printRequestInfos() - } - if ( getenv( "HTTP_AUTHORIZATION" ) ) - { -- QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO ); -+ QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), "Server", QgsMessageLog::INFO ); - } - } -