From 03bbefed7554b179c7563b45e42f9ed47488a2b16cd84bb1f46e34777552d597 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 27 Aug 2020 09:31:13 +0000
Subject: [PATCH 1/2] cleanup

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=15
---
 kdiff3.changes |  5 +++++
 kdiff3.spec    | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kdiff3.changes b/kdiff3.changes
index 8bd1274..e49485a 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 27 09:31:04 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Spec cleanup
+
 -------------------------------------------------------------------
 Thu Jun 25 11:49:33 UTC 2020 - wbauer@tmo.at
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 5d74deb..7a6e63d 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -62,7 +62,7 @@ KDiff3 is a program that:
 
 %build
   %cmake_kf5 -d build
-  %make_jobs
+  %cmake_build
 
 %install
   %kf5_makeinstall -C build
@@ -71,26 +71,26 @@ KDiff3 is a program that:
   %find_lang %{name} %{name}.lang --with-man
   %find_lang diff_ext %{name}.lang
   %find_lang kdiff3fileitemactionplugin %{name}.lang
-  %kf5_find_htmldocs
+  %{kf5_find_htmldocs}
 %endif
   %fdupes %{buildroot}
 
 %files
 %license COPYING
+%dir %{_kf5_iconsdir}/hicolor/256x256
+%dir %{_kf5_iconsdir}/hicolor/256x256/apps
+%doc %lang(en) %{_kf5_htmldir}/en/kdiff3
+%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man}
 %{_kf5_applicationsdir}/org.kde.kdiff3.desktop
 %{_kf5_appstreamdir}/org.kde.kdiff3.appdata.xml
 %{_kf5_bindir}/kdiff3
-%dir %{_kf5_iconsdir}/hicolor/256x256
-%dir %{_kf5_iconsdir}/hicolor/256x256/apps
 %{_kf5_iconsdir}/hicolor/*/apps/kdiff3.png
 %{_kf5_iconsdir}/hicolor/scalable/apps/kdiff3.svgz
 %{_kf5_kxmlguidir}/kdiff3/
 %{_kf5_kxmlguidir}/kdiff3part/
-%{_kf5_plugindir}/kf5/parts/
 %{_kf5_plugindir}/kf5/kfileitemaction/
+%{_kf5_plugindir}/kf5/parts/
 %{_kf5_servicesdir}/kdiff3part.desktop
-%doc %lang(en) %{_kf5_mandir}/man1/kdiff3.1%{?ext_man}
-%doc %lang(en) %{_kf5_htmldir}/en/kdiff3
 
 %if %{with lang}
 %files lang -f %{name}.lang

From c99bdbc17a0617fd19ca6fbfbae2c6931232e30f0acd69b236dcb47722a1fc8d Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Thu, 3 Sep 2020 13:02:47 +0000
Subject: [PATCH 2/2] Accepting request 831678 from
 home:wolfi323:branches:KDE:Extra

- Update to 1.8.4:
 * Fix typos in man page (kde#424177)
 * Fix compare over network with KIO (kde#408119)
 * Restore contextmenu for Windows Explorer

OBS-URL: https://build.opensuse.org/request/show/831678
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kdiff3?expand=0&rev=16
---
 kdiff3-1.8.3.tar.xz | 3 ---
 kdiff3-1.8.4.tar.xz | 3 +++
 kdiff3.changes      | 8 ++++++++
 kdiff3.spec         | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 kdiff3-1.8.3.tar.xz
 create mode 100644 kdiff3-1.8.4.tar.xz

diff --git a/kdiff3-1.8.3.tar.xz b/kdiff3-1.8.3.tar.xz
deleted file mode 100644
index 4d21e1e..0000000
--- a/kdiff3-1.8.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f35e9357a303144e3dd5a033a1a8caa70d3eecdb355213e9473cd04bc308bab
-size 1038904
diff --git a/kdiff3-1.8.4.tar.xz b/kdiff3-1.8.4.tar.xz
new file mode 100644
index 0000000..1ded24e
--- /dev/null
+++ b/kdiff3-1.8.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76e18e097a078c1a440a32562734391d71d12446fcd3b2afeece87c136f43bb8
+size 1040492
diff --git a/kdiff3.changes b/kdiff3.changes
index e49485a..2dafeb6 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  3 11:53:51 UTC 2020 - wbauer@tmo.at
+
+- Update to 1.8.4:
+ * Fix typos in man page (kde#424177)
+ * Fix compare over network with KIO (kde#408119)
+ * Restore contextmenu for Windows Explorer
+
 -------------------------------------------------------------------
 Thu Aug 27 09:31:04 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 7a6e63d..1ae5d5f 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -18,7 +18,7 @@
 
 %bcond_without lang
 Name:           kdiff3
-Version:        1.8.3
+Version:        1.8.4
 Release:        0
 Summary:        Code Comparison Utility
 License:        GPL-2.0-or-later