Merge pull request #5655 from Rmys/master

gdal:ver.bump

science/gis/gdal/actions.py

@@ -45,7 +45,7 @@ def setup():
                          --with-python \
                          --without-poppler \
                          --with-xerces \
-                         --without-openjpeg \
+                         --with-openjpeg \
                          --without-libtool \
                          --without-hdf4 \
                          --without-fme \
@@ -82,8 +82,8 @@ def install():
     #remove egg
 #    pisitools.removeDir("/usr/lib/python2.7/site-packages/GDAL-*")
 
-    pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3")
-    pisitools.removeDir("/usr/man/")
+    #pisitools.domove("/usr/man/man3/*", "/usr/share/man/man3")
+    #pisitools.removeDir("/usr/man/")
     #pisitools.domove("/usr/etc/bash_completion.d/*", "/etc/bash_completion.d")
     #pisitools.removeDir("/usr/etc")
 

science/gis/gdal/files/man.patch

@@ -0,0 +1,12 @@
+diff -Nuar a/configure b/configure
+--- a/configure	2018-06-23 18:05:47.000000000 +0300
++++ b/configure	2018-09-07 15:07:36.398094137 +0300
+@@ -35383,7 +35383,7 @@
+   datarootdir='${prefix}/share/gdal'
+ fi
+ 
+-mandir='${prefix}/man'
++mandir='${prefix}/share/man'
+ 
+ 
+ if test "$prefix" = "NONE" ; then

science/gis/gdal/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>A translator library for raster geospatial data formats (includes OGR support)</Summary>
         <Description>GDAL is a translator library for raster geospatial data formats which presents a single abstract data model to the calling application for all supported formats.</Description>
-        <Archive sha1sum="ba2bb0b7aedd227afc9541d13a857f967285db3c" type="targz">http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz</Archive>
+        <Archive sha1sum="f5cb70b5b17db25b9cebeea20ef081a8c1ee951f" type="targz">http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>bash-completion</Dependency>
             <Dependency>python-numpy</Dependency>
@@ -23,7 +23,7 @@
             <Dependency>tiff-devel</Dependency>
             <Dependency>webp-devel</Dependency>
             <Dependency>giflib-devel</Dependency>
-            <!--Dependency>jasper-devel</Dependency-->
+            <Dependency>openjpeg2-devel</Dependency>
             <Dependency>netcdf-devel</Dependency>
             <Dependency>podofo-devel</Dependency>
             <Dependency>cfitsio-devel</Dependency>
@@ -43,6 +43,7 @@
         </BuildDependencies>
         <Patches>
             <Patch>gdal-completion.patch</Patch>
+            <Patch>man.patch</Patch>
         </Patches>
     </Source>
 
@@ -62,6 +63,7 @@
             <Dependency>unixODBC</Dependency>
             <Dependency>xerces-c</Dependency>
             <Dependency>libfreexl</Dependency>
+            <Dependency>openjpeg2</Dependency>
             <Dependency>libgeotiff</Dependency>
             <Dependency>libjpeg-turbo</Dependency>
             <Dependency>postgresql-lib</Dependency>
@@ -131,6 +133,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2018-2018-07</Date>
+            <Version>2.3.1</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="5">
             <Date>2018-02-15</Date>
             <Version>2.2.3</Version>