Accepting request 544986 from Application:Geo:Staging

- Update to new upstream bugfix release 2.2.3
  See details https://trac.osgeo.org/gdal/wiki/Release/2.2.3-News 
- Packaging : 
  + remove wrong /usr/bin/env python shebang
  + use /usr/bin/python3 for all /usr/bin/gdal*.py scripts
- Remove gdal-2.2.2-mariadb_102_build_fix.patch merged upstream

OBS-URL: https://build.opensuse.org/request/show/544986
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=52

gdal-2.2.2-mariadb_102_build_fix.patch

@@ -1,58 +0,0 @@
-From d63c1a90f81fc3c1f58a8742fb68baf81340ea03 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@mines-paris.org>
-Date: Sun, 8 Oct 2017 16:40:23 +0000
-Subject: [PATCH] MySQL: fix build with MariaDB 10.2 (fixes #7079)
-
-git-svn-id: https://svn.osgeo.org/gdal/trunk@40361 f0d54148-0727-0410-94bb-9a71ac55c965
----
- gdal/ogr/ogrsf_frmts/mysql/ogr_mysql.h            |  1 -
- gdal/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 25 -----------------------
- 2 files changed, 26 deletions(-)
-
-Index: b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-===================================================================
---- a/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-+++ b/ogr/ogrsf_frmts/mysql/ogr_mysql.h
-@@ -43,7 +43,6 @@
- #pragma warning( disable : 4211 ) /* nonstandard extension used : redefined extern to static */
- #endif
- 
--#include <my_global.h>
- #include <mysql.h>
- 
- #ifdef _MSC_VER
-Index: b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-===================================================================
---- a/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-+++ b/ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp
-@@ -31,30 +31,6 @@
- #include <string>
- #include "ogr_mysql.h"
- 
--#ifdef _MSC_VER
--#pragma warning( push )
--#pragma warning( disable : 4201 ) /* nonstandard extension used : nameless struct/union */
--#endif
--#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
--#endif
--#ifdef __clang__
--#pragma clang diagnostic push
--#pragma clang diagnostic ignored "-Wunknown-pragmas"
--#pragma clang diagnostic ignored "-Wdocumentation"
--#endif
--#include <my_sys.h>
--#ifdef __clang__
--#pragma clang diagnostic pop
--#endif
--#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
--#pragma GCC diagnostic pop
--#endif
--#ifdef _MSC_VER
--#pragma warning( pop )
--#endif
--
- #include "cpl_conv.h"
- #include "cpl_string.h"
- 

gdal-2.2.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb25d6ee85f4f5ac1d5581958f8c6eed9b1d50746f82866fe92e507541def35b
-size 8243560

gdal-2.2.3.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a328d63d476b3653f5a25b5f7971e87a15cdf8860ab0729d4b1157ba988b8d0b
+size 8248472

gdal.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Nov 23 20:34:20 UTC 2017 - bruno@ioda-net.ch
+
+- Update to new upstream bugfix release 2.2.3
+  See details https://trac.osgeo.org/gdal/wiki/Release/2.2.3-News 
+- Packaging : 
+  + remove wrong /usr/bin/env python shebang
+  + use /usr/bin/python3 for all /usr/bin/gdal*.py scripts
+- Remove gdal-2.2.2-mariadb_102_build_fix.patch merged upstream
+
 -------------------------------------------------------------------
 Wed Nov  8 13:02:10 UTC 2017 - kstreitova@suse.com
 

gdal.spec

@@ -23,7 +23,7 @@
 %define sourcename gdal
 
 Name:           gdal
-Version:        2.2.2
+Version:        2.2.3
 Release:        0
 Summary:        GDAL/OGR - a translator library for raster and vector geospatial data formats
 License:        MIT and BSD-3-Clause and SUSE-Public-Domain
@@ -36,8 +36,6 @@ Patch1:         GDALmake.opt.in.patch
 # Fix hard coded name of libproj library
 # But libproj.so is valid if libproj-devel is installed ?
 Patch2:         gdal-libproj.patch
-# PATCH-FIX-UPSTREAM kstreitova@suse.com -- fix build with MariaDB 10.2
-Patch3:         gdal-2.2.2-mariadb_102_build_fix.patch
 BuildRequires:  blas-devel
 BuildRequires:  chrpath
 BuildRequires:  curl-devel
@@ -160,7 +158,6 @@ The GDAL python modules provide support to handle multiple GIS file formats.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # Fix mandir
 sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
@@ -170,6 +167,10 @@ for F in frmt_twms_srtm.xml frmt_wms_bluemarble_s3_tms.xml frmt_wms_virtualearth
   find . -name "${F}" -exec dos2unix {} \;
 done
 
+#Fix wrong /usr/bin/env phyton
+#Create the move to python3
+find . -iname "*.py" -exec sed -i 's,^#!/usr/bin/env python$,#!/usr/bin/python3,' {} \;
+
 %build
 # need to regenerate (old one does not accept CFLAGS)
 autoreconf -fi