From 3b961ab5eae161a0fa1f30beb80b04e64aae40684c4d4b112314f9b88fe5759a Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 11 Jan 2018 09:04:34 +0000
Subject: [PATCH] Accepting request 563450 from
 home:wolfi323:branches:Application:Geo

- Build without QtWebKit on Tumbleweed and SLE/Leap 15,
  libQtWebKit4 is about to be dropped soon
- Use cmake macros
- Cleanup with spec-cleaner
- Update to 2.18.15
- Update to 2.8.14 (Qgis 2.8 will become the new ltr soon)
- Remove obsolete BuildRequires qca-devel (qca 1.x has been removed
  in Tumbleweed)
  We've been already using libqca2-devel
  Fix boo@1065257
- Update to 2.18.13
- Update to 2.18.12
- Update to 2.18.11
- Fix error package name python-Pygments and python-Jinja2
- Update to 2.18.10
- Packaging
  + Add python2-Pygments and python2-Jinja2 need by MetaSearch
    Catalogue Client plugin
- Packaging
  + Remove non existent requires only python-qscintilla is needed,
    the qt4 and qt5 variant will requires the right -sip subpackage
  + Move python-qt4-devel to -devel package
- Update to 2.18.9
- Update to 2.18.7
- Update to 2.18.6
- Packaging:
  + remove merged upstream-85a0db2-additionnal-fix-sip.patch
  + Add full source url + md5
- Packaging:
  + Add upstream-85a0db2-additionnal-fix-sip.patch for sip 4.19.1
    exclusively applied for TW
- Update to 2.18.4
- Update to 2.18.3
- Packaging :
  + added upstream-2c43568-qt_bug.patch to fix build errors on Leap
- Fix build for non-x86 64-bit arch (aarch64 ppc64 ppc64le)
- Update to 2.18.2
- Update to 2.18.1
- Update to 2.18.0
- Update to 2.16.3
- Update to 2.16.2
- Update to 2.16.1
- Update to 2.16.0
- Update to 2.14.3
- Update to 2.14.2
- Update to 2.14.1
- Fix Desktop shortcut to 2.14.0 "Essen"
- Update to 2.14.0
- Update to 2.12.3
- Update to 2.12.2
- Update to libspatialindex4
- Update to 2.12.1
- New QGIS release 2.12.0
- back to using grass package
------------------------------------------------------------------
- New QGIS release 2.10.1
------------------------------------------------------------------
- New QGIS release 2.10.0
- obsolete qgis2-plugin-grass
- update to build with grass7 support instead of grass 6
- change cmake parameters to build with qgis server again
- change dependency order
- small update desktop file
- Minor QGIS release 2.8.2
- Minor QGIS release 2.8.1
- New QGIS release 2.8.0
- Do not obsolete grass7 unless grass-plugin is used
- Removed requirements (OBS resolves requirements automatically)
- New QGIS release 2.6.1
- obsolet grass7 - use grass stable package instead
- added python-wxWidgets as dependency
- added libqscintilla dependencies
- New QGIS release 2.6
- New QGIS release 2.4
- New QGIS release 2.2
- fix spatialite support for python plugin
- add sample data as separate package
- more spec cleanup
- add missing private declarations for python sip bindings
- fix qgis.spec file: add missing %dirs, cleanup
- Added python-psycopg2 as requirement
- clean up
- added python-qscintilla as requirement
- added python-matplotlib as requirement
- update to version 2.0.1, because of swisstopo acknowledgement for
  the splash screen and small bug fixes
- start building qgis packages for version 2.x

OBS-URL: https://build.opensuse.org/request/show/563450
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=226
---
 qgis.changes | 6 ++++++
 qgis.spec    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/qgis.changes b/qgis.changes
index c1e7409..32e02e9 100644
--- a/qgis.changes
+++ b/qgis.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  4 12:36:16 UTC 2018 - wbauer@tmo.at
+
+- Build without QtWebKit on Tumbleweed and SLE/Leap 15,
+  libQtWebKit4 is about to be dropped soon
+
 -------------------------------------------------------------------
 Wed Jan  3 12:27:30 UTC 2018 - fabian@ritter-vogt.de
 
diff --git a/qgis.spec b/qgis.spec
index 9b46d63..b0bf2c3 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -39,7 +39,9 @@ BuildRequires:  grass >= 7
 BuildRequires:  grass-devel
 BuildRequires:  gsl >= 1.8
 BuildRequires:  gsl-devel
+%if 0%{?suse_version} < 1500
 BuildRequires:  libQtWebKit-devel
+%endif
 BuildRequires:  libexpat-devel
 BuildRequires:  libgdal-devel >= 1.4.0
 BuildRequires:  libgeos-devel >= 3.4
@@ -166,6 +168,9 @@ export PATH=$PATH:$QTDIR/bin
   -DWITH_SERVER=TRUE \
   -DWITH_SERVER_PLUGINS=TRUE \
   -DWITH_POSTGRESQL=TRUE \
+%if 0%{?suse_version} >= 1500
+  -DWITH_QTWEBKIT=FALSE \
+%endif
   -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \
   -DQGIS_PLUGIN_SUBDIR=%{lib}/qgis \
   -DQGIS_MANUAL_SUBDIR=share/man \