From 4c7a077e5879f05b3326ce7bed859d516fa680be830699c177d73713a3a6caaa Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 16 Apr 2007 07:06:02 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=2

---
 kdiff3-0.9.91.tar.gz |  3 ---
 kdiff3-0.9.92.tar.gz |  3 +++
 kdiff3.changes       | 13 +++++++++++++
 kdiff3.spec          | 22 +++++++++++++++++-----
 4 files changed, 33 insertions(+), 8 deletions(-)
 delete mode 100644 kdiff3-0.9.91.tar.gz
 create mode 100644 kdiff3-0.9.92.tar.gz

diff --git a/kdiff3-0.9.91.tar.gz b/kdiff3-0.9.91.tar.gz
deleted file mode 100644
index 799e78b..0000000
--- a/kdiff3-0.9.91.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b22deb1ed23049b303427d8ac81d1e6010166fd6d5eb1dbdd6a075ee770ad9d3
-size 2173290
diff --git a/kdiff3-0.9.92.tar.gz b/kdiff3-0.9.92.tar.gz
new file mode 100644
index 0000000..c59be40
--- /dev/null
+++ b/kdiff3-0.9.92.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
+size 2220173
diff --git a/kdiff3.changes b/kdiff3.changes
index fd68a77..1ce0e88 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Apr 15 22:51:34 CEST 2007 - stbinner@suse.de
+
+- update to version 0.9.92:
+   * KDE-Konqueror plugin: Launch KDiff3 from Konqueror.
+   * Temp file names use process id in file name for several instances.
+   * New File comparison mode: Trust the size and date, but use
+     binary comparison if date doesn't match (unsafe)
+   * Open dialog also shows current dirs in directory comparison mode.
+   * New option for history merge: Max number of history entries
+   * New option "Auto save and quit on merge without conflicts"
+   * Several Bugfixes
+
 -------------------------------------------------------------------
 Sun Nov  5 10:20:48 CET 2006 - stbinner@suse.de
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 0869c1a..d42732a 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kdiff3 (Version 0.9.91)
+# spec file for package kdiff3 (Version 0.9.92)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -15,11 +15,11 @@ BuildRequires:  kdebase3-devel
 %if %suse_version < 1010
 BuildRequires:  unsermake update-desktop-files
 %endif
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 URL:            http://kdiff3.sourceforge.net/
 Group:          Development/Tools/Version Control
 Summary:        Feature-Rich Code Comparison Utility
-Version:        0.9.91
+Version:        0.9.92
 Release:        1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.gz
@@ -72,9 +72,21 @@ rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/kdiff3/README
 /opt/kde3/share/icons/*
 /opt/kde3/share/appl*/*/*.desktop
 /opt/kde3/share/apps/*
+/opt/kde3/share/applnk/.hidden/kdiff3plugin.desktop
 /opt/kde3/share/services/kdiff3part.desktop
+/opt/kde3/share/services/kdiff3_plugin.desktop
 
-%changelog -n kdiff3
+%changelog
+* Sun Apr 15 2007 - stbinner@suse.de
+- update to version 0.9.92:
+  * KDE-Konqueror plugin: Launch KDiff3 from Konqueror.
+  * Temp file names use process id in file name for several instances.
+  * New File comparison mode: Trust the size and date, but use
+  binary comparison if date doesn't match (unsafe)
+  * Open dialog also shows current dirs in directory comparison mode.
+  * New option for history merge: Max number of history entries
+  * New option "Auto save and quit on merge without conflicts"
+  * Several Bugfixes
 * Sun Nov 05 2006 - stbinner@suse.de
 - update to version 0.9.91:
   * Unicode autodetection based on byte-order-mark.