2007-01-16 00:19:58 +01:00
|
|
|
#
|
2007-04-16 09:06:02 +02:00
|
|
|
# spec file for package kdiff3 (Version 0.9.92)
|
2007-01-16 00:19:58 +01:00
|
|
|
#
|
2009-02-16 01:23:13 +01:00
|
|
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
2007-01-16 00:19:58 +01:00
|
|
|
#
|
2008-11-17 17:09:01 +01:00
|
|
|
# All modifications and additions to the file contributed by third parties
|
|
|
|
# remain the property of their copyright owners, unless otherwise agreed
|
|
|
|
# upon. The license for this file, and modifications and additions to the
|
|
|
|
# file, is the same license as for the pristine package itself (unless the
|
|
|
|
# license for the pristine package is not an Open Source License, in which
|
|
|
|
# case the license is the MIT License). An "Open Source License" is a
|
|
|
|
# license that conforms to the Open Source Definition (Version 1.9)
|
|
|
|
# published by the Open Source Initiative.
|
|
|
|
|
2007-01-16 00:19:58 +01:00
|
|
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
|
|
#
|
|
|
|
|
|
|
|
# norootforbuild
|
|
|
|
|
2008-11-17 17:09:01 +01:00
|
|
|
|
2007-01-16 00:19:58 +01:00
|
|
|
Name: kdiff3
|
|
|
|
BuildRequires: kdebase3-devel
|
|
|
|
%if %suse_version < 1010
|
|
|
|
BuildRequires: unsermake update-desktop-files
|
|
|
|
%endif
|
2007-06-14 00:38:14 +02:00
|
|
|
%if %suse_version > 1020
|
|
|
|
BuildRequires: fdupes
|
|
|
|
%endif
|
2008-11-17 17:09:01 +01:00
|
|
|
License: GPL v2 or later
|
|
|
|
Url: http://kdiff3.sourceforge.net/
|
2007-01-16 00:19:58 +01:00
|
|
|
Group: Development/Tools/Version Control
|
|
|
|
Summary: Feature-Rich Code Comparison Utility
|
2007-04-16 09:06:02 +02:00
|
|
|
Version: 0.9.92
|
2009-02-16 01:23:13 +01:00
|
|
|
Release: 237
|
2007-01-16 00:19:58 +01:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
|
|
Source0: %{name}-%{version}.tar.gz
|
|
|
|
Patch0: %name.diff
|
2008-11-17 17:09:01 +01:00
|
|
|
Patch1: kdiff3plugin-po.diff
|
2007-01-16 00:19:58 +01:00
|
|
|
|
|
|
|
%description
|
|
|
|
KDiff3 is a program that:
|
|
|
|
|
|
|
|
* Compares or merges two or three text input files or directories
|
|
|
|
|
|
|
|
* Shows the differences line-by-line and character-by-character
|
|
|
|
|
|
|
|
* Provides an automatic merge facility and an integrated editor for
|
|
|
|
comfortably solving merge conflicts
|
|
|
|
|
|
|
|
* Supports KIO on KDE (allows accessing ftp, sftp, fish, smb, etc.)
|
|
|
|
|
|
|
|
* Has an intuitive graphical user interface
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Authors:
|
|
|
|
--------
|
|
|
|
Joachim Eibl <joachim.eibl@gmx.de>
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%setup -q
|
|
|
|
%patch0 -p0
|
2008-11-17 17:09:01 +01:00
|
|
|
%patch1
|
2007-01-16 00:19:58 +01:00
|
|
|
. /etc/opt/kde3/common_options
|
|
|
|
update_admin
|
|
|
|
|
|
|
|
%build
|
|
|
|
. /etc/opt/kde3/common_options
|
|
|
|
./configure $configkde
|
|
|
|
make
|
|
|
|
|
|
|
|
%install
|
|
|
|
. /etc/opt/kde3/common_options
|
|
|
|
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
|
|
|
|
rm -rf $RPM_BUILD_ROOT/usr
|
|
|
|
rm -rf $RPM_BUILD_ROOT/opt/kde3/share/doc/HTML/kdiff3/README
|
|
|
|
%suse_update_desktop_file %name Development RevisionControl
|
2009-02-16 01:23:13 +01:00
|
|
|
kde_post_install
|
2008-11-17 17:09:01 +01:00
|
|
|
%find_lang %name %name.lang
|
|
|
|
%find_lang kdiff3_plugin %name.lang
|
2007-06-14 00:38:14 +02:00
|
|
|
%if %suse_version > 1020
|
|
|
|
%fdupes -s $RPM_BUILD_ROOT
|
|
|
|
%endif
|
2007-01-16 00:19:58 +01:00
|
|
|
|
|
|
|
%files -f %name.lang
|
|
|
|
%defattr(-,root,root)
|
|
|
|
%doc COPYING
|
|
|
|
/opt/kde3/bin/*
|
|
|
|
/opt/kde3/%_lib/kde3/lib*
|
|
|
|
/opt/kde3/share/icons/*
|
|
|
|
/opt/kde3/share/appl*/*/*.desktop
|
|
|
|
/opt/kde3/share/apps/*
|
2007-04-16 09:06:02 +02:00
|
|
|
/opt/kde3/share/applnk/.hidden/kdiff3plugin.desktop
|
2007-01-16 00:19:58 +01:00
|
|
|
/opt/kde3/share/services/kdiff3part.desktop
|
2007-04-16 09:06:02 +02:00
|
|
|
/opt/kde3/share/services/kdiff3_plugin.desktop
|
|
|
|
|
|
|
|
%changelog
|
2009-02-16 01:23:13 +01:00
|
|
|
* Sat Feb 14 2009 coolo@suse.de
|
|
|
|
- call kde_post_install
|
2008-11-17 17:09:01 +01:00
|
|
|
* Mon Nov 17 2008 stbinner@suse.de
|
|
|
|
- install translations for kdiff3 menu plugin (bnc#442527)
|
|
|
|
* Wed Jun 13 2007 stbinner@suse.de
|
2007-06-14 00:38:14 +02:00
|
|
|
- running fdupes makes kdiff3.rpm 348KB smaller
|
2008-11-17 17:09:01 +01:00
|
|
|
* Sun Apr 15 2007 stbinner@suse.de
|
2007-04-16 09:06:02 +02:00
|
|
|
- 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
|
2008-11-17 17:09:01 +01:00
|
|
|
* Sun Nov 05 2006 stbinner@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- update to version 0.9.91:
|
|
|
|
* Unicode autodetection based on byte-order-mark.
|
|
|
|
* Fix for crash after double click below last line
|
|
|
|
* Saving of maximized window-state (Patch by Robert Vock)
|
|
|
|
* Separated Merge-options in own tab
|
|
|
|
* When pasting multiple lines into openfile dialog only first
|
|
|
|
line is kept
|
|
|
|
* Drawing in directory view fixed.
|
|
|
|
* When specifying a separate output dir then for equal files a
|
|
|
|
copy operation will also be offered.
|
2008-11-17 17:09:01 +01:00
|
|
|
* Wed May 24 2006 adrian@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- fix build for < 10.1
|
2008-11-17 17:09:01 +01:00
|
|
|
* Tue May 16 2006 stbinner@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- update to version 0.9.90
|
|
|
|
* Fixed KIO-problems of type "File exists" with tempfiles.
|
|
|
|
* Fix for manual alignment with 3 files which caused crash.
|
|
|
|
* Preserve executable bit when overwriting an existing file.
|
|
|
|
* Documentation and translations updated.
|
2008-11-17 17:09:01 +01:00
|
|
|
* Mon Apr 10 2006 stbinner@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- update to version 0.9.89
|
2008-11-17 17:09:01 +01:00
|
|
|
* Wed Jan 25 2006 mls@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- converted neededforbuild to BuildRequires
|
2008-11-17 17:09:01 +01:00
|
|
|
* Tue Oct 25 2005 stbinner@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- update to version 0.9.88 (unicode support)
|
2008-11-17 17:09:01 +01:00
|
|
|
* Thu Feb 17 2005 adrian@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- menu entry moved to xdg dir
|
2008-11-17 17:09:01 +01:00
|
|
|
* Sat Sep 04 2004 coolo@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- fixing Makefile problems
|
2008-11-17 17:09:01 +01:00
|
|
|
* Sat Aug 28 2004 adrian@suse.de
|
2007-01-16 00:19:58 +01:00
|
|
|
- initial package of version 0.9.86
|