This commit is contained in:
commit
81780c6c77
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
3
kdiff3-0.9.91.tar.gz
Normal file
3
kdiff3-0.9.91.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b22deb1ed23049b303427d8ac81d1e6010166fd6d5eb1dbdd6a075ee770ad9d3
|
||||||
|
size 2173290
|
58
kdiff3.changes
Normal file
58
kdiff3.changes
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Nov 5 10:20:48 CET 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 18:57:23 CEST 2006 - adrian@suse.de
|
||||||
|
|
||||||
|
- fix build for < 10.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 16 09:22:18 CEST 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 11:00:58 CEST 2006 - stbinner@suse.de
|
||||||
|
|
||||||
|
- update to version 0.9.89
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 25 21:28:12 CET 2006 - mls@suse.de
|
||||||
|
|
||||||
|
- converted neededforbuild to BuildRequires
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 25 18:29:02 CEST 2005 - stbinner@suse.de
|
||||||
|
|
||||||
|
- update to version 0.9.88 (unicode support)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 17 13:36:38 CET 2005 - adrian@suse.de
|
||||||
|
|
||||||
|
- menu entry moved to xdg dir
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Sep 4 11:44:47 CEST 2004 - coolo@suse.de
|
||||||
|
|
||||||
|
- fixing Makefile problems
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Aug 28 18:15:11 CEST 2004 - adrian@suse.de
|
||||||
|
|
||||||
|
- initial package of version 0.9.86
|
||||||
|
|
9
kdiff3.diff
Normal file
9
kdiff3.diff
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
--- doc/Makefile.am.orig 2004-09-04 11:30:08.194094673 +0200
|
||||||
|
+++ doc/Makefile.am 2004-09-04 11:30:16.631353060 +0200
|
||||||
|
@@ -1,6 +1,4 @@
|
||||||
|
# the SUBDIRS is filled automatically by am_edit. If files are
|
||||||
|
# in this directory they are installed into the english dir
|
||||||
|
|
||||||
|
-KDE_LANG = en da de es et fr it nl pt sv
|
||||||
|
-KDE_DOCS = kdiff3
|
||||||
|
SUBDIRS = $(AUTODIRS)
|
108
kdiff3.spec
Normal file
108
kdiff3.spec
Normal file
@ -0,0 +1,108 @@
|
|||||||
|
#
|
||||||
|
# spec file for package kdiff3 (Version 0.9.91)
|
||||||
|
#
|
||||||
|
# Copyright (c) 2006 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) - all versions
|
||||||
|
URL: http://kdiff3.sourceforge.net/
|
||||||
|
Group: Development/Tools/Version Control
|
||||||
|
Summary: Feature-Rich Code Comparison Utility
|
||||||
|
Version: 0.9.91
|
||||||
|
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 <joachim.eibl@gmx.de>
|
||||||
|
|
||||||
|
%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/services/kdiff3part.desktop
|
||||||
|
|
||||||
|
%changelog -n kdiff3
|
||||||
|
* 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
|
Loading…
Reference in New Issue
Block a user