update to GDAL3, GDAl2 is now built in gdal2 in case software wont work with gdal3

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

gdal-2.4.2.tar.xz

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

gdal-2.4.2.tar.xz.md5

@@ -1 +0,0 @@
-7b9e293b9426ffaa2d7287a4880d7139  gdal-2.4.2.tar.xz

gdal-3.0.1.tar.xz

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

gdal-3.0.1.tar.xz.md5

@@ -0,0 +1 @@
+f3bcf494f8285861dedaa5b9aa6e9479  gdal-3.0.1.tar.xz

gdal.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Jul  8 13:34:52 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- update to 3.0.1
+  Full changelogs:
+  https://trac.osgeo.org/gdal/wiki/Release/3.0.1-News
+  https://trac.osgeo.org/gdal/wiki/Release/3.0.0-News
+  Patch pkg-config-libpq.patch included upstream
+
 -------------------------------------------------------------------
 Mon Jul  8 09:47:06 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
 

gdal.spec

@@ -18,7 +18,7 @@
 
 # Soname should be bumped on API/ABI break
 # http://trac.osgeo.org/gdal/ticket/4543
-%define soversion 20
+%define soversion 26
 %define sourcename gdal
 # Uppercase GDAL is the canonical name for this package in Python
 %define pypi_package_name GDAL
@@ -26,7 +26,7 @@
 %bcond_with ecw5_support
 %bcond_with fgdb_support
 Name:           gdal
-Version:        2.4.2
+Version:        3.0.1
 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
@@ -37,8 +37,6 @@ Source1:        http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ver
 Patch0:         gdal-perl.patch
 # Fix occasional parallel build failure
 Patch1:         GDALmake.opt.in.patch
-# Fix UPSTREAM Patch (pr#1418 in progress) upstream issue #1412
-Patch2:         pkg-config-libpq.patch
 BuildRequires:  KEALib-devel
 BuildRequires:  blas-devel
 BuildRequires:  chrpath

pkg-config-libpq.patch

@@ -1,65 +0,0 @@
-diff -rup a/configure.ac b/configure.ac
---- a/configure.ac	2019-03-15 13:30:02.000000000 +0100
-+++ b/configure.ac	2019-04-06 21:29:50.153490589 +0200
-@@ -1249,12 +1249,10 @@ PG_CONFIG=no
- 
- AC_ARG_WITH(pg,
- 	    AS_HELP_STRING([--with-pg[=ARG]],
--	       [Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,)
-+	       [Include PostgreSQL GDAL/OGR Support (ARG=yes,no)]),,)
- 
- if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then
--  AC_PATH_PROG(PG_CONFIG, pg_config, no)
--else
--  PG_CONFIG=$with_pg
-+  PG_CONFIG=yes
- fi
- 
- AC_MSG_CHECKING([for PostgreSQL])
-@@ -1268,23 +1266,24 @@ if test "x$PG_CONFIG" = "xno" ; then
-   AC_MSG_RESULT([no])
- 
- else
--  if test -d ${PG_CONFIG} ; then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([--with-pg argument is a directory.  It should be the path to the pg_config script, often somewhere like /usr/local/pgsql/bin/pg_config.])
--  fi
--
--  if test \! -x ${PG_CONFIG} ; then
--      AC_MSG_RESULT([no])
--      AC_MSG_ERROR([--with-pg argument is a not an executable file.  It should be the path to the pg_config script, often somewhere like /usr/local/pgsql/bin/pg_config.])
--  fi
--
--  AC_MSG_RESULT([yes])
- 
--  AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,-L`$PG_CONFIG --libdir`)
-+  PKG_PROG_PKG_CONFIG([0.21])
-+  PKG_CHECK_MODULES([PQ],[libpq > 9.1], [HAVE_PG=yes], [HAVE_PG=no])
- 
-   if test "${HAVE_PG}" = "yes" ; then
--    LIBS=-L`$PG_CONFIG --libdir`" -lpq $LIBS"
--    PG_INC=-I`$PG_CONFIG --includedir`" -I"`$PG_CONFIG --includedir-server`
-+    PG_LIB="${PQ_LIBS}"
-+    PG_INC="${PQ_CFLAGS}"
-+    SAVED_LIBS="${LIBS}"
-+    LIBS="${PG_LIBS}"
-+    AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no)
-+    LIBS="${SAVED_LIBS}"
-+    if test "${HAVE_PG}" = "yes" ; then
-+      LIBS="${PG_LIB} ${LIBS}"
-+    fi
-+  else
-+    if "x$with_pg" = "xyes"; then
-+      AC_MSG_ERROR([--with-pg was requested, but libpq is not available])
-+    fi
-   fi
- 
- fi
-@@ -1293,6 +1292,7 @@ AC_SUBST(HAVE_PG,$HAVE_PG)
- AC_SUBST(PG_INC,$PG_INC)
- AC_SUBST(PG_LIB,$PG_LIB)
- 
-+
- dnl ---------------------------------------------------------------------------
- dnl Check if we should build with GRASS support.
- dnl ---------------------------------------------------------------------------