Accepting request 766312 from Application:Geo

OBS-URL: https://build.opensuse.org/request/show/766312
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdal?expand=0&rev=46

0001-Replace-SWIG-Python-obj0-swig_obj-0-with-version-agn.patch

@@ -1,66 +0,0 @@
-From 8f52960e1c6f2fde21fbc3cfe8064af84f90a09d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Thu, 5 Sep 2019 20:05:53 +0200
-Git-id: 8328ae3077aea7e54537d76a9a8193775ddc8b09
-Subject: [PATCH] Replace SWIG Python obj0/swig_obj[0] with version agnostic
- $self
-
-"obj0" was only meant as a porting helper and should not be used, even
-with swig 3.0, see swig/swig@cd8fc0a.
-Use the correct "$self" notation, which is expanded to the correct
-code regardless of swig version and options.
-
-Acked-by: Libor Pechacek <lpechacek@gmx.com>
----
- swig/include/gdal_array.i             | 12 +++---------
- swig/include/python/typemaps_python.i |  8 +-------
- 2 files changed, 4 insertions(+), 16 deletions(-)
-
-diff --git a/swig/include/gdal_array.i b/swig/include/gdal_array.i
-index d86491d1d45e..6ee34b9abd99 100644
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -913,18 +913,12 @@ retStringAndCPLFree* GetArrayFilename(PyArrayObject *psArray)
-     }
- 
-     /* Keep a reference to the VirtualMem object */
--%#if SWIGVERSION >= 0x040000
--%#define obj0 swig_obj[0]
--%#endif
- %#if NPY_API_VERSION >= 0x00000007
--    PyArray_SetBaseObject(ar, obj0);
-+    PyArray_SetBaseObject(ar, $self);
- %#else
--    PyArray_BASE(ar) = obj0;
--%#endif
--    Py_INCREF(obj0);
--%#if SWIGVERSION >= 0x040000
--%#undef obj0
-+    PyArray_BASE(ar) = $self;
- %#endif
-+    Py_INCREF($self);
-     Py_DECREF($result);
-     $result = (PyObject*) ar;
- }
-diff --git a/swig/include/python/typemaps_python.i b/swig/include/python/typemaps_python.i
-index 85a25b5a3099..2af8b51c6368 100644
---- a/swig/include/python/typemaps_python.i
-+++ b/swig/include/python/typemaps_python.i
-@@ -2067,13 +2067,7 @@ DecomposeSequenceOf4DCoordinates( PyObject *seq, int nCount, double *x, double *
-   /* %typemap(argout) (void** pptr, size_t* pnsize, GDALDataType* pdatatype, int* preadonly)*/
-   Py_buffer *buf=(Py_buffer*)malloc(sizeof(Py_buffer));
- 
--  if (PyBuffer_FillInfo(buf,
--%#if SWIGVERSION >= 0x040000
--                        swig_obj[0],
--%#else
--                        obj0,
--%#endif
--                        *($1), *($2), *($4), PyBUF_ND)) {
-+  if (PyBuffer_FillInfo(buf, $self, *($1), *($2), *($4), PyBUF_ND)) {
-     // error, handle
-   }
-   if( *($3) == GDT_Byte )
--- 
-2.23.0
-

gdal-3.0.2.tar.xz

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

gdal-3.0.2.tar.xz.md5

@@ -1 +0,0 @@
-0353d7e56efc79fcaaeb21d808cb9cac  gdal-3.0.2.tar.xz

gdal-3.0.3.tar.xz

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

gdal-3.0.3.tar.xz.md5

@@ -0,0 +1 @@
+b03722401c43e38ae7661d6465bde7b5  gdal-3.0.3.tar.xz

gdal.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan 22 08:05:11 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
+
+- update to version 3.0.3 bugfix release
+  + Fix build with poppler 0.83 boo#1161399
+  + Changelog https://github.com/OSGeo/gdal/blob/v3.0.3/gdal/NEWS
+- Remove merged upstream patch
+  0001-Replace-SWIG-Python-obj0-swig_obj-0-with-version-agn.patch
+- refresh spec file with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Nov  6 12:58:46 UTC 2019 - Libor Pechacek <lpechacek@gmx.com>
 
@@ -18,7 +28,7 @@ Thu Oct 10 08:26:00 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 Sun Oct  6 12:00:05 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
 
 - Fix build error on TW due to boo#1153146 poppler missing boost
-  devel 
+  devel
 
 -------------------------------------------------------------------
 Thu Sep  5 18:50:20 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

gdal.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdal
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 %bcond_with ecw5_support
 %bcond_with fgdb_support
 Name:           gdal
-Version:        3.0.2
+Version:        3.0.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 @@ Source1:        http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ver
 Patch0:         gdal-perl.patch
 # Fix occasional parallel build failure
 Patch1:         GDALmake.opt.in.patch
-# PATCH-FIX-UPSTREAM -- https://github.com/OSGeo/gdal/pull/1819
-Patch3:         0001-Replace-SWIG-Python-obj0-swig_obj-0-with-version-agn.patch
 BuildRequires:  KEALib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -171,6 +169,9 @@ sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
 for F in frmt_twms_srtm.xml frmt_wms_bluemarble_s3_tms.xml frmt_wms_virtualearth.xml frmt_twms_Clementine.xml;do
   find . -name "${F}" -exec dos2unix {} \;
 done
+# Fix spurious exec perm
+find . -type f -name "style_ogr_brush.png" -exec chmod 0644 {} \;
+find . -type f -name "style_ogr_sym.png" -exec chmod 0644 {} \;
 
 #Fix wrong /usr/bin/env phyton
 #Create the move to python3