Accepting request 87458 from KDE:Distro:Factory

- update to 0.9.96:
  * KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4
  * Parser for preprocessor commands. (Allows single apostrophs ')
  * Fix crash on A/B-overview (infinite recursion)
  * Fix clearcase temp files not deleted problem on windows
  * KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore
  * String corrections (Frederik Schwarzer)
  * Fixed writing to KIO.
  * Fixed white space merge default options

OBS-URL: https://build.opensuse.org/request/show/87458
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdiff3?expand=0&rev=18
This commit is contained in:
Lars Vogdt 2011-10-12 14:12:37 +00:00 committed by Git OBS Bridge
parent f26578dd79
commit 1075bf13a0
4 changed files with 26 additions and 10 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9560a441915e54236291650006783a2e02be51635afdbef010deafd71798a057
size 818151

3
kdiff3-0.9.96.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10e74ec47d57ccae13f71f836fd5bab85db46a40762398ca3a515b552e75d691
size 1796595

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Oct 12 00:28:44 CEST 2011 - dmueller@suse.de
- update to 0.9.96:
* KDiff3FileItemActionPlugin : Context menu that also works in dolphin (for KDE>=4
* Parser for preprocessor commands. (Allows single apostrophs ')
* Fix crash on A/B-overview (infinite recursion)
* Fix clearcase temp files not deleted problem on windows
* KDiff3 plugin: When launching KDiff3 konqueror isn't blocked anymore
* String corrections (Frederik Schwarzer)
* Fixed writing to KIO.
* Fixed white space merge default options
-------------------------------------------------------------------
Sat Sep 17 21:04:19 UTC 2011 - toddrme2178@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package kdiff3 (Version 0.9.95)
# spec file for package kdiff3
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 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
@ -15,14 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kdiff3
Version: 0.9.95
Version: 0.9.96
Release: 10
License: GPLv2+
Summary: Feature-Rich Code Comparison Utility
Url: http://kdiff3.sourceforge.net/
Group: Development/Tools/Version Control
Source0: %{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.gz
BuildRequires: fdupes
BuildRequires: kdebase4-workspace-devel
BuildRequires: libkonq-devel
@ -60,7 +62,7 @@ KDiff3 is a program that:
%kde_post_install
%find_lang %{name} %{name}.lang
%find_lang kdiff3plugin %{name}.lang
%find_lang desktop_extragear-utils_kdiff3 %{name}.lang
%find_lang kdiff3fileitemactionplugin %{name}.lang
rm %{buildroot}%{_kde4_htmldir}/*/kdiff3/common
%fdupes -s %{buildroot}
@ -69,12 +71,13 @@ KDiff3 is a program that:
%doc COPYING
%{_kde4_applicationsdir}/kdiff3.desktop
%{_kde4_appsdir}/kdiff3/
%{_kde4_appsdir}/kdiff3part/
%{_kde4_bindir}/kdiff3
%{_kde4_iconsdir}/??color/*/apps/kdiff3.png
%{_kde4_modulesdir}/libkdiff3part.so
%{_kde4_modulesdir}/libkdiff3plugin.so
%{_kde4_modulesdir}/kdiff3fileitemaction.so
%{_kde4_servicesdir}/kdiff3part.desktop
%{_kde4_servicesdir}/kdiff3_plugin.desktop
%{_kde4_servicesdir}/kdiff3fileitemaction.desktop
%files lang -f %{name}.lang