From 8c99564959d0b6a8e1ff50cb88ec689d084764e0b4ef46ab7ceb8659f5b6e49c Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 9 Jun 2023 17:34:21 +0000
Subject: [PATCH] Accepting request 1091806 from
 home:aspiers:branches:KDE:Extra

- Update to 1.10.4
  * Fixed no UI shown for failed auto-merge.

- Update to 1.10.3
  * Fix 469817 no text if word wrap is on.

OBS-URL: https://build.opensuse.org/request/show/1091806
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=42
---
 kdiff3-1.10.2.tar.xz     |  3 ---
 kdiff3-1.10.2.tar.xz.sig | 16 ----------------
 kdiff3-1.10.4.tar.xz     |  3 +++
 kdiff3-1.10.4.tar.xz.sig | 16 ++++++++++++++++
 kdiff3.changes           |  8 ++++++++
 kdiff3.spec              |  2 +-
 6 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 kdiff3-1.10.2.tar.xz
 delete mode 100644 kdiff3-1.10.2.tar.xz.sig
 create mode 100644 kdiff3-1.10.4.tar.xz
 create mode 100644 kdiff3-1.10.4.tar.xz.sig

diff --git a/kdiff3-1.10.2.tar.xz b/kdiff3-1.10.2.tar.xz
deleted file mode 100644
index 182433c..0000000
--- a/kdiff3-1.10.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bddc7c1ef4e70960b3f4d9894f137041345b75ed09ca86bde001649ba3ef44b3
-size 1112600
diff --git a/kdiff3-1.10.2.tar.xz.sig b/kdiff3-1.10.2.tar.xz.sig
deleted file mode 100644
index babd898..0000000
--- a/kdiff3-1.10.2.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmRRkKsACgkQ9EKzbWFL
-BrxZsA/+IdQTUM8nKE/z9FHadpwYDuoEYhPHncUR+6aeYrzIYFmyhI82+XkiuYmd
-w9137Z7Sf6Pa/mRkwhOiU2fxC9yydtld/nNudA0uNxjuH+gzUFWjYgy5qeFUOCiW
-x6olG5nHxhO8r8fYBurwKiTQwFUqpzpqXT+4tmZiK6hvZFbQjo0Z2vUgoTNKkrl2
-lVm5+HoU0Ev+ymAEQpv6vW93rPOqYs0jQ1zDGa1J6RhdhqAih1SY5ZCIYaPgEvxy
-as84CFeVZXuL1FlTmJZk6tMDh5MDysftaZNVCmbmmz2VIw34D547oN+UTmwXBwtx
-c1cpv11kGlkoRZQ+0JnRYRCZSCAYvSGDvC3KdkDTuslDHfN9HY2xNLN+Xhcl0P64
-qNx8eKZj6gNb1xYFiHMFk9IwuaCqsW9gkVaPZ+H9jZNJfvs9mhHZ0TQpEavOfmE8
-Q0Z9YYmysoAHyVYrc29LRmoaRNVW6IbhqrL7H9tm5c+CR9yI3VrLjtVoJ/Y+bxv+
-fbTysoxmALgwNcw5MgkaGCjQdBrMewHkdcLK8Oviz+drL5yb6gJ9V7FsNP/O6yyy
-sjTIDKHzASuw0A6hewr/hDeGiXNkpLNh12jEiO6GHYXGbC4SVAkzLMLmwwvY5mnU
-35eqvbMhYKMoyjVnFZZ/CxLN4t4yyyXGsE7GQZb4IM/yKyCf9yI=
-=hwRL
------END PGP SIGNATURE-----
diff --git a/kdiff3-1.10.4.tar.xz b/kdiff3-1.10.4.tar.xz
new file mode 100644
index 0000000..bfd8206
--- /dev/null
+++ b/kdiff3-1.10.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2afff4b7a4989bf4a0a37867f25b76bab88df3ab65a2f7d409a7b4bed07059d
+size 1112620
diff --git a/kdiff3-1.10.4.tar.xz.sig b/kdiff3-1.10.4.tar.xz.sig
new file mode 100644
index 0000000..69e151b
--- /dev/null
+++ b/kdiff3-1.10.4.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmRlcJQACgkQ9EKzbWFL
+BryajBAApzVsDx6mdHXURlKsU/8+xOU/29TDT1BnBHHaMsxvqzs//8bbHn78vCzY
++tABxnZW7RDGXP+t5OteXtP99ogxt8FeNGXnqeZ3+PR1yCFUUtTgiaMHVP+MdbtT
+J4GVfOBZI7PKq8rY7CA3oA9olvAbL4+fUP0kVG/LGeclI84U6V26JX1kCk61lzvM
+cJARj+tXutXxtnUqLrHcC2nCWX3T4DVNycqg8J2PeBupv+PwQNmDXU8K6lTm0l8U
+wkDEJFCgHwHnuJmuSHw0+PrkknTSiiMdY6MUPsTdzpiE6ORxjtHLzaQ+yLUL3k3F
+0gbdkmdzTMS17170kLchYApLUB0xFAoHq+wllbUaAdWNBy1EYOn3pTsic2ih5jZc
+5B0XuYylTlcQA07pm9r4y9eOR6L09Itdqe06TNTZKnZ+co1+x7NFjaScA+iJkU47
+OvHRnflKRTOaVFwOH8rQoPUQNi2xe10OHXUQJ8FzX+xd3C5u2VMH3P0Tlvn0vghc
+1G/ZIGaxToUByA8k3ABX6VVHEZ7jtkr4/saEOYuWQ5pY79TYl26ADM/A17Nm/k+u
+k69txr79VWxOke1xtWq7s6YoQZ359OuP2Yp4Vlc+t7gfzUo5A5mQEf32ZAiubMiC
+zj8/5YE8SbAiJ4BfvgarCYBleDsbQLoFDhQkhkfpOqqXngK3Pg8=
+=ht6d
+-----END PGP SIGNATURE-----
diff --git a/kdiff3.changes b/kdiff3.changes
index 4ece52f..362c659 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jun  9 14:03:17 BST 2023 - Adam Spiers <suse@adamspiers.org>
+
+- Update to 1.10.4
+  * Fixed no UI shown for failed auto-merge.
+- Update to 1.10.3
+  * Fix 469817 no text if word wrap is on.
+
 -------------------------------------------------------------------
 Wed May  3 13:42:10 UTC 2023 - Christophe Marin <christophe@krop.fr>
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 24aa4ab..82753d9 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -18,7 +18,7 @@
 
 %bcond_without released
 Name:           kdiff3
-Version:        1.10.2
+Version:        1.10.4
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later