# # spec file for package kdiff3 (Version 0.9.92) # # 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. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: kdiff3 BuildRequires: kdebase3-devel %if %suse_version < 1010 BuildRequires: unsermake update-desktop-files %endif 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.92 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.gz Patch0: %name.diff %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 %prep %setup -q %patch0 -p0 . /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 %find_lang %name %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/* /opt/kde3/share/applnk/.hidden/kdiff3plugin.desktop /opt/kde3/share/services/kdiff3part.desktop /opt/kde3/share/services/kdiff3_plugin.desktop %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. * 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. * Wed May 24 2006 - adrian@suse.de - fix build for < 10.1 * Tue May 16 2006 - stbinner@suse.de - 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. * Mon Apr 10 2006 - stbinner@suse.de - update to version 0.9.89 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Tue Oct 25 2005 - stbinner@suse.de - update to version 0.9.88 (unicode support) * Thu Feb 17 2005 - adrian@suse.de - menu entry moved to xdg dir * Sat Sep 04 2004 - coolo@suse.de - fixing Makefile problems * Sat Aug 28 2004 - adrian@suse.de - initial package of version 0.9.86