From 4330d1047a0bec3b77b14d3a9f86ab54d565d224 Mon Sep 17 00:00:00 2001 From: Brylie Christopher Oxley Date: Tue, 12 Jun 2018 22:22:05 +0300 Subject: [PATCH] [2.1.x] Updated GIS install instructions to use placeholders for GIS library versions. Backport of ae26e0ad2c5ee2216d8eaaaac9d7c2c7644b6ebb from master --- docs/ref/contrib/gis/install/geolibs.txt | 25 ++++++++++----------- docs/ref/contrib/gis/install/spatialite.txt | 12 +++++----- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index 7800f1ab62d..759c841534c 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -98,16 +98,15 @@ internal geometry representation used by GeoDjango (it's behind the "lazy" geometries). Specifically, the C API library is called (e.g., ``libgeos_c.so``) directly from Python using ctypes. -First, download GEOS 3.4.2 from the GEOS website and untar the source -archive:: +First, download GEOS from the GEOS website and untar the source archive:: - $ wget http://download.osgeo.org/geos/geos-3.4.2.tar.bz2 - $ tar xjf geos-3.4.2.tar.bz2 + $ wget http://download.osgeo.org/geos/geos-X.Y.Z.tar.bz2 + $ tar xjf geos-X.Y.Z.tar.bz2 Next, change into the directory where GEOS was unpacked, run the configure script, compile, and install:: - $ cd geos-3.4.2 + $ cd geos-X.Y.Z $ ./configure $ make $ sudo make install @@ -159,15 +158,15 @@ reference systems. First, download the PROJ.4 source code and datum shifting files [#]_:: - $ wget http://download.osgeo.org/proj/proj-4.9.1.tar.gz - $ wget http://download.osgeo.org/proj/proj-datumgrid-1.5.tar.gz + $ wget http://download.osgeo.org/proj/proj-X.Y.Z.tar.gz + $ wget http://download.osgeo.org/proj/proj-datumgrid-X.Y.tar.gz Next, untar the source code archive, and extract the datum shifting files in the ``nad`` subdirectory. This must be done *prior* to configuration:: - $ tar xzf proj-4.9.1.tar.gz - $ cd proj-4.9.1/nad - $ tar xzf ../../proj-datumgrid-1.5.tar.gz + $ tar xzf proj-X.Y.Z.tar.gz + $ cd proj-X.Y.Z/nad + $ tar xzf ../../proj-datumgrid-X.Y.tar.gz $ cd .. Finally, configure, make and install PROJ.4:: @@ -189,9 +188,9 @@ supports :doc:`GDAL's vector data <../gdal>` capabilities [#]_. First download the latest GDAL release version and untar the archive:: - $ wget http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz - $ tar xzf gdal-1.11.2.tar.gz - $ cd gdal-1.11.2 + $ wget http://download.osgeo.org/gdal/X.Y.Z/gdal-X.Y.Z.tar.gz + $ tar xzf gdal-X.Y.Z.tar.gz + $ cd gdal-X.Y.Z Configure, make and install:: diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt index b2765e7808d..86c906aca79 100644 --- a/docs/ref/contrib/gis/install/spatialite.txt +++ b/docs/ref/contrib/gis/install/spatialite.txt @@ -49,9 +49,9 @@ just skip this section. To install from sources, download the latest amalgamation source archive from the `SQLite download page`__, and extract:: - $ wget https://sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz - $ tar xzf sqlite-amalgamation-3.6.23.1.tar.gz - $ cd sqlite-3.6.23.1 + $ wget https://www.sqlite.org/YYYY/sqlite-amalgamation-XXX0000.zip + $ unzip sqlite-amalgamation-XXX0000.zip + $ cd sqlite-amalgamation-XXX0000 Next, run the ``configure`` script -- however the ``CFLAGS`` environment variable needs to be customized so that SQLite knows to build the R*Tree module:: @@ -72,9 +72,9 @@ SpatiaLite library (``libspatialite``) Get the latest SpatiaLite library source bundle from the `download page`__:: - $ wget https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.1.0.tar.gz - $ tar xaf libspatialite-4.1.0.tar.gz - $ cd libspatialite-4.1.0 + $ wget https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-X.Y.Z.tar.gz + $ tar xaf libspatialite-X.Y.Z.tar.gz + $ cd libspatialite-X.Y.Z $ ./configure $ make $ sudo make install