From e5a3b02b6dcbb3cd17ad1a179f0bf1863a15b043544b5731a082b59ff0cceecc Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Wed, 7 Dec 2022 16:35:42 +0000
Subject: [PATCH] Accepting request 1041169 from home:dirkmueller:Factory

- update to 1.9.6:
  * Fix horizontal scroll to be by character not pixels
  * Update window when ending selection mode.

OBS-URL: https://build.opensuse.org/request/show/1041169
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=36
---
 kdiff3-1.9.5.tar.xz     |  3 ---
 kdiff3-1.9.5.tar.xz.sig | 16 ----------------
 kdiff3-1.9.6.tar.xz     |  3 +++
 kdiff3-1.9.6.tar.xz.sig | 16 ++++++++++++++++
 kdiff3.changes          |  7 +++++++
 kdiff3.spec             |  2 +-
 6 files changed, 27 insertions(+), 20 deletions(-)
 delete mode 100644 kdiff3-1.9.5.tar.xz
 delete mode 100644 kdiff3-1.9.5.tar.xz.sig
 create mode 100644 kdiff3-1.9.6.tar.xz
 create mode 100644 kdiff3-1.9.6.tar.xz.sig

diff --git a/kdiff3-1.9.5.tar.xz b/kdiff3-1.9.5.tar.xz
deleted file mode 100644
index e55bcf9..0000000
--- a/kdiff3-1.9.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:083721596d9d4373bc2f1298394a8ddb5b55a7ad4d7242933a7cd8ae64683c1a
-size 1057524
diff --git a/kdiff3-1.9.5.tar.xz.sig b/kdiff3-1.9.5.tar.xz.sig
deleted file mode 100644
index 4b001d8..0000000
--- a/kdiff3-1.9.5.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmIf4pkACgkQ9EKzbWFL
-BryNXQ//QqoAjebi4zL/O1gUGoPIkxwCsER8//5I9/tE/yjHpj5pvuY6X9P5Bokn
-fpqp1BO4TgV9zHjOVGecLQBRjhQ8E/jVG1I5PE4T5ZiUPbuzg0jMAikdX0MbhD2H
-4ieDVZlD+PJA9R9BCAF8xmBUcNfAXDXu6st0Dp8oHiMkbB2RsfSENLgwY463WbPh
-EY7X1KKz4Z/eh00DZNei0nXo43wXOe1onkhczwzKMJeX4rORlW6k7GmoiNippfXa
-FYv7EeknDVEVIPUFmdKJ/qYI5WDirfVXPmFPGMgGXXkMlEOGj8AYIbUTmkH4Hu68
-vWFN3QB77Mv/OyHs/MoLk1pio1F2C8E/bnNaCmG0cA20nwYpLP8zC5B7w5HPsaT3
-jDht16muLFlWabFak8Bydd8wSRsM1IcS8uewgJL0llDhOglTb1JEL0p3D37/dMa1
-9IgZ/sAQD6vvqQy+/AIyMb8mHhfFsat5Oh3tgR6iiitbRq6vZEeAlfp8q/a4+8Bk
-QBTzt1SxuJ3O7b5XJIJgWUKb0t51VR3A24cMOWroh+J8qgQvUBhCxuxJ/KhfVE+T
-PHT+A48OIfEtNTq+61Hr86zJ/pM+ZaUNCgVK8vLa348hAlIDMX+8DoTZxzsRt1g+
-hSCf9X3EDoNkPSy5Dty2zpZUQl5d2K8kF6bOXbGy5ynOGC0CLiQ=
-=jAXf
------END PGP SIGNATURE-----
diff --git a/kdiff3-1.9.6.tar.xz b/kdiff3-1.9.6.tar.xz
new file mode 100644
index 0000000..e43beaa
--- /dev/null
+++ b/kdiff3-1.9.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac922476f850613a739284e3faf477c98ac349ad15a737a2b72ded8451f6b2bc
+size 1059880
diff --git a/kdiff3-1.9.6.tar.xz.sig b/kdiff3-1.9.6.tar.xz.sig
new file mode 100644
index 0000000..2ad78e5
--- /dev/null
+++ b/kdiff3-1.9.6.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE7lbXEIhdNvseTSHz9EKzbWFLBrwFAmK4upsACgkQ9EKzbWFL
+BryFtg/+L0W545J62Sgq+aekwKJBs6jArDh/rtqPg9qlCqbc3Zu/PYPB0qLZHbTJ
+pMl3/j6YjyYRHYagw6MnekYZWEQSRc9BgPunAs1lOlVBTs2VPu7UMpPLwmXRlmv0
+bWY9zlkpfpRekfGuQhiKoKUhd00+V/Wr4MW5GRVKY1mcSTMEhgVxrDYA7P9TdDVm
+FOSwFOEGz8/6+s3XvFa04yUpHkR+4OjJmk4qQJ1RwQbDvj42bYfgZ4iVaeDVRNcV
+2006gdHTZilAtxRX8KxDKCQUJ291PgxCJZAMB1yhCpkRUmtyY5oONiGcyhdGr6Kc
+3e+EchDjWgDnKTxIsgjNmR7q3efTRvyZVxmOCQzvjqYPPV8ORLQtghE5bjcDmPFf
++uNx99/UI4ZPwrv2Xot8Zq+voh1ng44LPAFmSR46K0xe061b63KTfB4KjsZgnGEx
+v0MGCvvtlTGyr/z2VA9KOT1JPHa6QWKV1IlOSzr4evDhcc42cIRas/NosB1tEXlf
+oiZEa2XF6ewkIErKjFEo38b/DqpAXQZWMlNxELOuxUpkYPwJHAYQ7yd5eu7YFJC0
+D856J7u03jM68fmUkQSZ6OWOrx/CqSpt0AHrn/mEPghBqmLHxCR1Rma1lBilyO1u
+YdF7nUb9DRwTlis95toOpcm61SsTQ1xZe0xwJv+9zXRzU6Ze9JQ=
+=wPc3
+-----END PGP SIGNATURE-----
diff --git a/kdiff3.changes b/kdiff3.changes
index f7a0bb8..30fa8a4 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec  7 16:25:32 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.9.6:
+  * Fix horizontal scroll to be by character not pixels
+  * Update window when ending selection mode.
+
 -------------------------------------------------------------------
 Fri Mar  4 08:49:54 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 37928a0..aec73a6 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           kdiff3
-Version:        1.9.5
+Version:        1.9.6
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later