Hello community, here is the log from the commit of package tkdiff for openSUSE:Factory checked in at 2018-10-11 11:51:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tkdiff (Old) and /work/SRC/openSUSE:Factory/.tkdiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tkdiff" Thu Oct 11 11:51:42 2018 rev:20 rq:640096 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/tkdiff/tkdiff.changes 2017-11-14 13:03:14.525741641 +0100 +++ /work/SRC/openSUSE:Factory/.tkdiff.new/tkdiff.changes 2018-10-11 11:52:56.262215381 +0200 @@ -1,0 +2,28 @@ +Fri Oct 5 08:07:14 UTC 2018 - Martin Pluskal <[email protected]> + +- Use variables for version handling +- Update dependencies + +------------------------------------------------------------------- +Thu Oct 4 17:02:59 UTC 2018 - Michał Rostecki <[email protected]> + +- Update to 4.3.5 + * New Diff Dialog now allows browsing for files OR directories + * Tool arguments now permit cross-branch SCM comparison + specification + * Ability to view Ancestorfile also denotes 3way mode is active + * 3-way collisions now findable via toolbar dropdown list + highlights + * Textwin labels now tooltip the name & modtime of any NON-temp + file + * Builtin editor now provides Line numbers + * Recent new color preference settings repaired to "apply" + correctly + * Crash fixed when 3-way diff was active and Lnums & Chgbars are + OFF + * Pre-startup latency msg feature now OFF (MacOS X only) stops + Crash + * Repaired Lnums,etc. to use CDR preference settings when + appropriate + +------------------------------------------------------------------- Old: ---- tkdiff-4.2.tar.gz New: ---- tkdiff-4-3-5.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tkdiff.spec ++++++ --- /var/tmp/diff_new_pack.tzT5Gn/_old 2018-10-11 11:52:57.586213697 +0200 +++ /var/tmp/diff_new_pack.tzT5Gn/_new 2018-10-11 11:52:57.586213697 +0200 @@ -1,7 +1,7 @@ # # spec file for package tkdiff # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,20 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%global longver 4-3-5 +%global shortver %(echo %{longver}|sed 's|-|.|g') Name: tkdiff -Version: 4.2 +Version: %{shortver} Release: 0 Summary: 2 and 3-way diff/merge tool -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Text/Utilities -Url: http://tkdiff.sourceforge.net/ -Source0: http://prdownloads.sourceforge.net/tkdiff/tkdiff-%{version}.tar.gz +URL: http://tkdiff.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/tkdiff/tkdiff-%{longver}.zip Source1: README.SUSE +BuildRequires: unzip Requires: diffutils +Requires: tcl Requires: tk BuildArch: noarch @@ -33,7 +37,7 @@ TkDiff is a graphical 2 and 3-way diff/merge tool. %prep -%setup -q -n tkdiff-unix +%setup -q -n tkdiff-%{longver} cp %{SOURCE1} . %build
