From e42bd66e8eff11b0e4e757587805c0b889b56419ee63902647b5fd0127aebfa4 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 3 Dec 2012 08:42:35 +0000
Subject: [PATCH] Accepting request 143294 from KDE:Distro:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/143294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=22
---
 kdiff3-0.9.96.tar.gz |  3 ---
 kdiff3-0.9.97.tar.gz |  3 +++
 kdiff3.changes       | 17 +++++++++++++++++
 kdiff3.spec          | 14 ++++++--------
 4 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 100644 kdiff3-0.9.96.tar.gz
 create mode 100644 kdiff3-0.9.97.tar.gz

diff --git a/kdiff3-0.9.96.tar.gz b/kdiff3-0.9.96.tar.gz
deleted file mode 100644
index 0e6e313..0000000
--- a/kdiff3-0.9.96.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10e74ec47d57ccae13f71f836fd5bab85db46a40762398ca3a515b552e75d691
-size 1796595
diff --git a/kdiff3-0.9.97.tar.gz b/kdiff3-0.9.97.tar.gz
new file mode 100644
index 0000000..1a52fbd
--- /dev/null
+++ b/kdiff3-0.9.97.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
+size 1803769
diff --git a/kdiff3.changes b/kdiff3.changes
index 7fdafe4..9ca84ea 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Nov 20 16:10:19 UTC 2012 - nico.kruber@gmail.com
+
+- Fix the SLES build (%make_install is not expanded on SLES)
+
+-------------------------------------------------------------------
+Tue Nov 20 16:08:20 UTC 2012 - nico.kruber@gmail.com
+
+- update to 0.9.97:
+  * Memory usage optimized for comparison of large directories.
+  * In overview for two way diff show if only one side contains text.
+  * If text is selected in either input or output window use that in Find dialog.
+  * Command line option --cs doesn't change the config value permanently anymore.
+  * Windows 64 bit specific installer.
+  * Bugfixes.
+- removed libkdiff3part.so (not build anymore)
+
 -------------------------------------------------------------------
 Wed Oct 12 00:28:44 CEST 2011 - dmueller@suse.de
 
diff --git a/kdiff3.spec b/kdiff3.spec
index 43bcc69..eaeab2f 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdiff3
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,13 @@
 #
 
 
-
 Name:           kdiff3
-Version:        0.9.96
-Release:        10
-License:        GPL-2.0+
+Version:        0.9.97
+Release:        0
 Summary:        Feature-Rich Code Comparison Utility
-Url:            http://kdiff3.sourceforge.net/
+License:        GPL-2.0+
 Group:          Development/Tools/Version Control
+Url:            http://kdiff3.sourceforge.net/
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  kdebase4-workspace-devel
@@ -56,7 +55,7 @@ KDiff3 is a program that:
 
 %install
   pushd build
-  %make_install
+  make DESTDIR=%{buildroot} install
   popd
   %suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File
   %kde_post_install
@@ -74,7 +73,6 @@ KDiff3 is a program that:
 %{_kde4_appsdir}/kdiff3part/
 %{_kde4_bindir}/kdiff3
 %{_kde4_iconsdir}/??color/*/apps/kdiff3.png
-%{_kde4_modulesdir}/libkdiff3part.so
 %{_kde4_modulesdir}/kdiff3fileitemaction.so
 %{_kde4_servicesdir}/kdiff3part.desktop
 %{_kde4_servicesdir}/kdiff3fileitemaction.desktop