From 4e589ee6fb51718e09e1276fe58b9707d7978cdfe8fa467983591cdcaac17187 Mon Sep 17 00:00:00 2001
From: Bruno Friedmann <bruno@ioda-net.ch>
Date: Sun, 19 Jul 2020 09:31:26 +0000
Subject: [PATCH] Accepting request 821700 from
 home:StefanBruens:branches:science

- Work-around occasional build failures due to incomplete ordering
  in Makefile. (https://github.com/OSGeo/gdal/issues/2777)
- Avoid double gdal prefix for /usr/share/gdal/gdal/*

OBS-URL: https://build.opensuse.org/request/show/821700
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=122
---
 gdal.changes | 7 +++++++
 gdal.spec    | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gdal.changes b/gdal.changes
index 1b27241..4a7930a 100644
--- a/gdal.changes
+++ b/gdal.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jul 19 01:20:55 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Work-around occasional build failures due to incomplete ordering
+  in Makefile. (https://github.com/OSGeo/gdal/issues/2777)
+- Avoid double gdal prefix for /usr/share/gdal/gdal/*
+
 -------------------------------------------------------------------
 Tue Jul  7 18:29:25 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
 
diff --git a/gdal.spec b/gdal.spec
index 4c715b3..868a907 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -202,7 +202,7 @@ autoreconf -fi
 %configure \
         --prefix=%{_prefix}     \
         --includedir=%{_includedir}/gdal \
-        --datadir=%{_datadir}/gdal \
+        --datadir=%{_datadir}   \
         --with-threads          \
         --disable-static        \
         --with-geotiff          \
@@ -266,7 +266,9 @@ do
   make %{?_smp_mflags} -C swig/${M} generate
 done
 
-make %{?_smp_mflags} VERBOSE=1 all \
+# Workaround incomplete ordering in Makefile
+%make_build lib-dependencies
+%make_build all
 
 # Make Python 3 module
 pushd swig/python