From c56ecae5aa111519058cd2c9b31659d867293c4c848706922d083927907bcb59 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Wed, 16 Mar 2022 10:15:53 +0000
Subject: [PATCH] Accepting request 962080 from
 home:bruno_friedmann:branches:Application:Geo

- Update to version 3.4.2 bugfix release
  See changelog https://github.com/OSGeo/gdal/blob/v3.4.2/gdal/NEWS.md
- Remove merged upstream patches gdal-fix-poppler-leap.patch
  and gdal-fix-build-poppler.patch

OBS-URL: https://build.opensuse.org/request/show/962080
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=151
---
 gdal-3.4.1.tar.xz         | 3 ---
 gdal-3.4.1.tar.xz.md5     | 1 -
 gdal-3.4.2.tar.xz         | 3 +++
 gdal-3.4.2.tar.xz.md5     | 1 +
 gdal.changes              | 8 ++++++++
 gdal.spec                 | 7 +------
 gdalautotest-3.4.1.tar.gz | 3 ---
 gdalautotest-3.4.2.tar.gz | 3 +++
 8 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 gdal-3.4.1.tar.xz
 delete mode 100644 gdal-3.4.1.tar.xz.md5
 create mode 100644 gdal-3.4.2.tar.xz
 create mode 100644 gdal-3.4.2.tar.xz.md5
 delete mode 100644 gdalautotest-3.4.1.tar.gz
 create mode 100644 gdalautotest-3.4.2.tar.gz

diff --git a/gdal-3.4.1.tar.xz b/gdal-3.4.1.tar.xz
deleted file mode 100644
index d27f63c..0000000
--- a/gdal-3.4.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:332f053516ca45101ef0f7fa96309b64242688a8024780a5d93be0230e42173d
-size 13257288
diff --git a/gdal-3.4.1.tar.xz.md5 b/gdal-3.4.1.tar.xz.md5
deleted file mode 100644
index 1662861..0000000
--- a/gdal-3.4.1.tar.xz.md5
+++ /dev/null
@@ -1 +0,0 @@
-6c42056c81abf84edcb2022b53fb2974  gdal-3.4.1.tar.xz
diff --git a/gdal-3.4.2.tar.xz b/gdal-3.4.2.tar.xz
new file mode 100644
index 0000000..def89e3
--- /dev/null
+++ b/gdal-3.4.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16baf03dfccf9e3f72bb2e15cd2d5b3f4be0437cdff8a785bceab0c7be557335
+size 13273280
diff --git a/gdal-3.4.2.tar.xz.md5 b/gdal-3.4.2.tar.xz.md5
new file mode 100644
index 0000000..c7eaf47
--- /dev/null
+++ b/gdal-3.4.2.tar.xz.md5
@@ -0,0 +1 @@
+4b6ac60068a60059a31e125b2a169d86  gdal-3.4.2.tar.xz
diff --git a/gdal.changes b/gdal.changes
index d66f3e1..06259b6 100644
--- a/gdal.changes
+++ b/gdal.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Mar 15 19:33:40 UTC 2022 - Bruno Friedmann <bruno@ioda-net.ch>
+
+- Update to version 3.4.2 bugfix release
+  See changelog https://github.com/OSGeo/gdal/blob/v3.4.2/gdal/NEWS.md
+- Remove merged upstream patches gdal-fix-poppler-leap.patch
+  and gdal-fix-build-poppler.patch 
+
 -------------------------------------------------------------------
 Tue Mar  8 14:47:15 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gdal.spec b/gdal.spec
index 09d44c1..04b6850 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -29,7 +29,7 @@
 %bcond_with heif_support
 %bcond_with tests_support
 Name:           gdal
-Version:        3.4.1
+Version:        3.4.2
 Release:        0
 Summary:        GDAL/OGR - a translator library for raster and vector geospatial data formats
 License:        BSD-3-Clause AND MIT AND SUSE-Public-Domain
@@ -38,11 +38,6 @@ Source0:        https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ve
 Source1:        https://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{version}.tar.xz.md5
 Source2:        https://download.osgeo.org/%{name}/%{version}/%{sourcename}autotest-%{version}.tar.gz
 Patch0:         gdal-perl.patch
-# PATCH-FIX-UPSTREAM gdal-fix-build-poppler.patch -- Fix build with poppler 22.03.0 and newer
-Patch1:         gdal-fix-build-poppler.patch
-# PATCH-FIX-UPSTREAM gdal-fix-poppler-leap.patch -- Fix build on Leap 15.4 and poppler
-Patch2:         gdal-fix-poppler-leap.patch
-
 BuildRequires:  KEALib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
diff --git a/gdalautotest-3.4.1.tar.gz b/gdalautotest-3.4.1.tar.gz
deleted file mode 100644
index 05e871d..0000000
--- a/gdalautotest-3.4.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30e328099ecb79754613785f354765f506d49815554babdbbc8d8460d68b45ec
-size 49233920
diff --git a/gdalautotest-3.4.2.tar.gz b/gdalautotest-3.4.2.tar.gz
new file mode 100644
index 0000000..fd1dd13
--- /dev/null
+++ b/gdalautotest-3.4.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95b8abd697fb0576b8a6dc009fed6a557944c3a5869bc218722541c19f52bff9
+size 49571840