From 82418ea04e0981dd23a3b538a9d51721c92ad362 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Sun, 30 Apr 2017 15:54:04 +0200
Subject: [PATCH] debian packaging: disable WITH_PYSPATIALITE in favor of
 libsqlite3-mod-spatialite

---
 INSTALL                | 7 +++----
 debian/control.in      | 3 ++-
 debian/rules           | 1 -
 doc/INSTALL.html       | 7 +++----
 doc/osx.t2t            | 1 -
 rpm/qgis.spec.template | 1 -
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/INSTALL b/INSTALL
index ff5348b8c8e..e6204e7e3bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Saturday April 29, 2017
+Sunday April 30, 2017
 
 
-Last Updated: Saturday April 29, 2017
-Last Change : Saturday April 29, 2017
+Last Updated: Sunday April 30, 2017
+Last Change : Sunday April 30, 2017
 
 
   1. Introduction
@@ -1784,7 +1784,6 @@ In a Terminal cd to the qgis source folder previously downloaded, then:
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
   -D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
-  -D WITH_PYSPATIALITE=FALSE \
   -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
   -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
   -D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
diff --git a/debian/control.in b/debian/control.in
index 90732d03766..f508c3deab2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,7 +17,7 @@ Build-Depends:
  libgeos-dev (>= 3.0.0),
  libpq-dev,
  libproj-dev,
- libspatialite-dev,
+ libspatialite-dev, libsqlite3-mod-spatialite,
  libsqlite3-dev,
  libspatialindex-dev,
  qtbase5-dev, qttools5-dev-tools, qttools5-dev, qtscript5-dev, qtpositioning5-dev, qt5keychain-dev,
@@ -331,6 +331,7 @@ Depends:
  python3-plotly,
  python3-pyproj,
  python3-owslib,
+ libsqlite3-mod-spatialite,
  libqgispython{QGIS_ABI},
  ${shlibs:Depends},
  ${python:Depends},
diff --git a/debian/rules b/debian/rules
index 0404968e1d3..95ae406ad06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,6 @@ CMAKE_OPTS := \
 	-DWITH_SERVER_PLUGINS=TRUE \
 	-DWITH_QWTPOLAR=FALSE \
 	-DWITH_QSPATIALITE=TRUE \
-	-DWITH_PYSPATIALITE=TRUE \
 	-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
 	-DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#') \
 	-DDOXYGEN_ON_DEMAND=TRUE
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index e90b7a64faf..ef8a835109c 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -77,13 +77,13 @@ label{  background-color: #FFFFCC;
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Saturday April 29, 2017</H3>
+<H3>Sunday April 30, 2017</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Saturday April 29, 2017
-Last Change : Saturday April 29, 2017
+Last Updated: Sunday April 30, 2017
+Last Change : Sunday April 30, 2017
 </P>
 <DIV CLASS="toc">
 
@@ -2480,7 +2480,6 @@ mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
 -D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
--D WITH_PYSPATIALITE=FALSE \
 -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
 -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
 -D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
diff --git a/doc/osx.t2t b/doc/osx.t2t
index 77502646a35..6b587cb4258 100644
--- a/doc/osx.t2t
+++ b/doc/osx.t2t
@@ -812,7 +812,6 @@ mkdir build
 cd build
 cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
 -D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
--D WITH_PYSPATIALITE=FALSE \
 -D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
 -D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
 -D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \
diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template
index d22ac8ae025..d825f064065 100644
--- a/rpm/qgis.spec.template
+++ b/rpm/qgis.spec.template
@@ -211,7 +211,6 @@ gzip ChangeLog
       -D ENABLE_TESTS:BOOL=FALSE \
       -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
       -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-      -D WITH_PYSPATIALITE:BOOL=FALSE \
       -D WITH_SERVER:BOOL=TRUE \
       %{configure_with_spatialite} \
       .