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 \