From 6ab6e1d2ecaf02a95f5deb7c7924613789aa2179ff34cc016d284eb631d47757 Mon Sep 17 00:00:00 2001
From: Nicolas Rochard <nrochard@gmail.com>
Date: Fri, 20 Jan 2017 15:08:18 +0000
Subject: [PATCH] Accepting request 451655 from
 home:Le_Docteur:branches:Application:Geo

OBS-URL: https://build.opensuse.org/request/show/451655
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=207
---
 qgis-2.18.2.tar.bz2           |  3 ---
 qgis-2.18.3.tar.bz2           |  3 +++
 qgis.changes                  |  7 ++++++
 qgis.desktop                  |  2 +-
 qgis.spec                     |  7 ++++--
 upstream-2c43568-qt_bug.patch | 45 +++++++++++++++++++++++++++++++++++
 6 files changed, 61 insertions(+), 6 deletions(-)
 delete mode 100644 qgis-2.18.2.tar.bz2
 create mode 100644 qgis-2.18.3.tar.bz2
 create mode 100644 upstream-2c43568-qt_bug.patch

diff --git a/qgis-2.18.2.tar.bz2 b/qgis-2.18.2.tar.bz2
deleted file mode 100644
index 530c1b5..0000000
--- a/qgis-2.18.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3abcd3e21d875e353e6e1cf729f444677b9d209d30beeb1bb8d0afac7d28b0ea
-size 92501258
diff --git a/qgis-2.18.3.tar.bz2 b/qgis-2.18.3.tar.bz2
new file mode 100644
index 0000000..acbf809
--- /dev/null
+++ b/qgis-2.18.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97e374b1a3c330a5e5cfd7cd6ee75414e5a96aaee4ef2568ab753660975d372b
+size 92523924
diff --git a/qgis.changes b/qgis.changes
index 30fe69e..f0cbe47 100644
--- a/qgis.changes
+++ b/qgis.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 18 10:32:58 UTC 2017 - nrochard@gmail.com
+
+- Update to 2.18.3
+- Packaging : 
+  + added upstream-2c43568-qt_bug.patch to fix build errors on Leap
+
 -------------------------------------------------------------------
 Thu Jan  5 09:12:22 UTC 2017 - guillaume@opensuse.org
 
diff --git a/qgis.desktop b/qgis.desktop
index 02705f8..424aa53 100644
--- a/qgis.desktop
+++ b/qgis.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=QGIS 2.18.2 (Las Palmas)
+Name=QGIS 2.18.3 (Las Palmas)
 GenericName=Geographic Information System
 Comment=
 Exec=qgis
diff --git a/qgis.spec b/qgis.spec
index 4aee5e3..6e9f0a0 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qgis
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           qgis
-Version:        2.18.2
+Version:        2.18.3
 Release:        0
 Summary:        QGIS is a Geographic Information System (GIS)
 License:        GPL-2.0
@@ -27,6 +27,8 @@ 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
@@ -124,6 +126,7 @@ 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
new file mode 100644
index 0000000..623a5c5
--- /dev/null
+++ b/upstream-2c43568-qt_bug.patch
@@ -0,0 +1,45 @@
+From 77b8c3d67b868024e31120a38e3df9c0583e90bd Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef@norbit.de>
+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 );
+   }
+ }
+