commit tkdiff for openSUSE:Factory
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.changes2017-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
+
+- Use variables for version handling
+- Update dependencies
+
+---
+Thu Oct 4 17:02:59 UTC 2018 - Michał Rostecki
+
+- 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
commit tkdiff for openSUSE:Factory
Hello community,
here is the log from the commit of package tkdiff for openSUSE:Factory checked
in at 2017-11-14 13:02:41
Comparing /work/SRC/openSUSE:Factory/tkdiff (Old)
and /work/SRC/openSUSE:Factory/.tkdiff.new (New)
Package is "tkdiff"
Tue Nov 14 13:02:41 2017 rev:19 rq:541549 version:4.2
Changes:
--- /work/SRC/openSUSE:Factory/tkdiff/tkdiff.changes2011-11-29
12:52:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.tkdiff.new/tkdiff.changes 2017-11-14
13:03:14.525741641 +0100
@@ -1,0 +2,11 @@
+Mon Nov 13 16:59:39 UTC 2017 - mplus...@suse.com
+
+- Run spec-cleaner
+
+---
+Mon Nov 13 15:45:27 UTC 2017 - dims...@opensuse.org
+
+- Rename README.SuSE to README.SUSE, adhering to the correct
+ spelling.
+
+---
Old:
README.SuSE
New:
README.SUSE
Other differences:
--
++ tkdiff.spec ++
--- /var/tmp/diff_new_pack.DuV43l/_old 2017-11-14 13:03:16.169681531 +0100
+++ /var/tmp/diff_new_pack.DuV43l/_new 2017-11-14 13:03:16.169681531 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tkdiff
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -15,38 +15,35 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: tkdiff
-BuildArch: noarch
-License:GPL-2.0+
-Group: Productivity/Text/Utilities
-Requires: tk diffutils
Version:4.2
Release:0
Summary:2 and 3-way diff/merge tool
+License:GPL-2.0+
+Group: Productivity/Text/Utilities
Url:http://tkdiff.sourceforge.net/
Source0:
http://prdownloads.sourceforge.net/tkdiff/tkdiff-%{version}.tar.gz
-Source1:README.SuSE
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source1:README.SUSE
+Requires: diffutils
+Requires: tk
+BuildArch: noarch
%description
TkDiff is a graphical 2 and 3-way diff/merge tool.
%prep
-%setup -q -n "tkdiff-unix"
-cp %{S:1} .
+%setup -q -n tkdiff-unix
+cp %{SOURCE1} .
%build
%install
-install -d -m 755 $RPM_BUILD_ROOT/usr/bin
-install -m 755 tkdiff $RPM_BUILD_ROOT/usr/bin/tkdiff
+install -Dpm 0755 tkdiff \
+ %{buildroot}%{_bindir}/tkdiff
%files
-%defattr(-,root,root)
-%doc README.SuSE
-/usr/bin/tkdiff
+%doc README.SUSE
+%{_bindir}/tkdiff
%changelog
++ README.SUSE ++
###
#
# TkDiff -- A graphical front-end to diff for Unix and NT.
# Copyright (C) 1994-1998 by John M. Klassa.
# Copyright (C) 1999-2001 by AccuRev Inc.
# Copyright (C) 2002-2005 by John M. Klassa.
#
# TkDiff Home Page: http://tkdiff.sourceforge.net/
# Mailing list, mail archive, etc.
#
# Usage:
# To interactively pick files:
# tkdiff
#
# Plain files:
# tkdiff
#
# Plain file with conflict markers:
# tkdiff -conflict
#
# Source control AccuRev/CVS/RCS/Perforce/PVCS/SCCS:
# tkdiff (same as -r)
# tkdiff -r
# tkdiff -r
# tkdiff -r -r
# tkdiff -r -r
#
# Options:
# -a
# -o
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# THINGS TO DO:
#
# the code that parses the command line ought to be separated from the
# code that reads in the files. That way we can parse the command line
# right up front and display potential problems on stdout instead of
# waiting until the window display.
###
commit tkdiff for openSUSE:Factory
Hello community, here is the log from the commit of package tkdiff for openSUSE:Factory checked in at 2011-12-06 19:08:39 Comparing /work/SRC/openSUSE:Factory/tkdiff (Old) and /work/SRC/openSUSE:Factory/.tkdiff.new (New) Package is tkdiff, Maintainer is mse...@novell.com Changes: Other differences: -- ++ tkdiff.spec ++ --- /var/tmp/diff_new_pack.FmNvAf/_old 2011-12-06 19:42:53.0 +0100 +++ /var/tmp/diff_new_pack.FmNvAf/_new 2011-12-06 19:42:53.0 +0100 @@ -20,7 +20,7 @@ Name: tkdiff BuildArch: noarch -License:GPL v2 or later +License:GPL-2.0+ Group: Productivity/Text/Utilities Requires: tk diffutils Version:4.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tkdiff for openSUSE:Factory
Hello community,
here is the log from the commit of package tkdiff for openSUSE:Factory checked
in at 2011-11-29 12:52:42
Comparing /work/SRC/openSUSE:Factory/tkdiff (Old)
and /work/SRC/openSUSE:Factory/.tkdiff.new (New)
Package is tkdiff, Maintainer is mse...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/tkdiff/tkdiff.changes2011-09-23
12:48:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.tkdiff.new/tkdiff.changes 2011-11-29
12:52:44.0 +0100
@@ -1,0 +2,16 @@
+Mon Nov 28 23:40:16 UTC 2011 - pascal.ble...@opensuse.org
+
+- update to 4.2:
+ * works with Subversion 1.7
+ * make opening file dialog know where it started from, and start in the same
+directory as the first file when looking for the second one
+ * you can now specify a preference for filetypes for the file open/save
+dialogs
+ * detect PVCS by environment variable (patch 1839361 by nafmo)
+ * update BitKeeper support (patch 3053551 by wscott)
+ * mercurial support (patch 1867700 by damonmc)
+ * rudimentary Git support (patch 1836293 by cecilh3)
+ * add help menu items to report versions of wish and diff
+ * gave it a debug (-d) option
+
+---
Old:
tkdiff-4.1.4-git.patch
tkdiff-4.1.4-unix.tar.bz2
New:
tkdiff-4.2.tar.gz
Other differences:
--
++ tkdiff.spec ++
--- /var/tmp/diff_new_pack.WbTRD1/_old 2011-11-29 12:52:45.0 +0100
+++ /var/tmp/diff_new_pack.WbTRD1/_new 2011-11-29 12:52:45.0 +0100
@@ -19,34 +19,23 @@
Name: tkdiff
-%define real_version 4.1.4-unix
BuildArch: noarch
License:GPL v2 or later
Group: Productivity/Text/Utilities
Requires: tk diffutils
-AutoReqProv:on
-Version:4.1.4
-Release:68
+Version:4.2
+Release:0
Summary:2 and 3-way diff/merge tool
Url:http://tkdiff.sourceforge.net/
-Source0:%{name}-%{real_version}.tar.bz2
+Source0:
http://prdownloads.sourceforge.net/tkdiff/tkdiff-%{version}.tar.gz
Source1:README.SuSE
-Patch1: tkdiff-4.1.4-git.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
TkDiff is a graphical 2 and 3-way diff/merge tool.
-
-
-Authors:
-
-John M. Klassa kla...@ipass.net
-
%prep
-%setup -n tkdiff-4.1.4-unix
-%patch1
-#
+%setup -q -n tkdiff-unix
cp %{S:1} .
%build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit tkdiff for openSUSE:Factory
Hello community,
here is the log from the commit of package tkdiff for openSUSE:Factory
checked in at Fri Jul 22 09:05:04 CEST 2011.
--- tkdiff/tkdiff.changes 2007-11-27 15:42:26.0 +0100
+++ /mounts/work_src_done/STABLE/tkdiff/tkdiff.changes 2011-07-21
17:24:50.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 21 15:05:38 UTC 2011 - r...@wi.rr.com
+
+- patch to add git support from sf.net#1836293
+
+---
calling whatdependson for head-i586
New:
tkdiff-4.1.4-git.patch
Other differences:
--
++ tkdiff.spec ++
--- /var/tmp/diff_new_pack.D7uE07/_old 2011-07-22 09:04:09.0 +0200
+++ /var/tmp/diff_new_pack.D7uE07/_new 2011-07-22 09:04:09.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package tkdiff (Version 4.1.4)
+# spec file for package tkdiff
#
-# Copyright (c) 2009 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
@@ -26,11 +26,12 @@
Requires: tk diffutils
AutoReqProv:on
Version:4.1.4
-Release:57
+Release:68
Summary:2 and 3-way diff/merge tool
Url:http://tkdiff.sourceforge.net/
Source0:%{name}-%{real_version}.tar.bz2
Source1:README.SuSE
+Patch1: tkdiff-4.1.4-git.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -44,6 +45,7 @@
%prep
%setup -n tkdiff-4.1.4-unix
+%patch1
#
cp %{S:1} .
++ tkdiff-4.1.4-git.patch ++
--- tkdiff.orig 2007-11-15 00:52:48.0 -0600
+++ tkdiff 2011-07-21 10:14:03.222156059 -0500
@@ -738,6 +738,7 @@ proc get-file-rev {f index {r }} {
set acopt
set cvsopt
set svnopt
+set gitopt
set rcsopt
set sccsopt
set bkopt
@@ -749,6 +750,7 @@ proc get-file-rev {f index {r }} {
set acopt -v \$r\
set cvsopt -r $r
set svnopt -r $r
+set gitopt $r:
set rcsopt $r
set sccsopt -r$r
set bkopt -r$r
@@ -765,6 +767,10 @@ proc get-file-rev {f index {r }} {
regsub -all {\$} $f {\$} f
set dirname [file dirname $f]
set tailname [file tail $f]
+ set cmdext
+ if {$::tcl_platform(platform) == windows} {
+ set cmdext .exe
+ }
debug-info $f
# For CVS, if it isn't checked out there is neither a CVS nor RCS
@@ -795,6 +801,19 @@ proc get-file-rev {f index {r }} {
debug-info Setting lbl $finfo(lbl,$index)
die-unless exec $cmd cat $svnopt \$f\ $finfo(pth,$index)
}
+} elseif {[exec git$cmdext rev-parse --is-inside-work-tree] == true} {
+set cmd git$cmdext
+ set prefix [exec git rev-parse --show-prefix]
+if {$r == || $rev == rBASE} {
+set finfo(lbl,$index) $f (SVN BASE)
+debug-info Setting lbl $finfo(lbl,$index)
+die-unless exec $cmd show \:$prefix$f\ \
+ $finfo(pth,$index)
+} else {
+set finfo(lbl,$index) $f (SVN $rev)
+debug-info Setting lbl $finfo(lbl,$index)
+die-unless exec $cmd show \$gitopt$prefix$f\ $finfo(pth,$index)
+}
} elseif {[regexp {://} $f]} {
# Subversion command can have the form
# svn diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]
@@ -6105,8 +6124,8 @@ proc do-usage {mode} {
Plain file with conflict markers:
tkdiff -conflict FILE
-Source control (AccuRev, BitKeeper, CVS, Subversion, Perforce, PVCS,
- RCS, SCCS, ClearCase)
+Source control (AccuRev, BitKeeper, CVS, Subversion, Git, Perforce,
+ PVCS, RCS, SCCS, ClearCase)
tkdiff FILE
tkdiff -rREV FILE
tkdiff -rREV1 -rREV2 FILE
@@ -6125,7 +6144,9 @@ $g(name) detects and supports RCS, CVS,
directory with the same name. It detects and supports PVCS by looking \
for a vcs.cfg file. It detects and supports AccuRev, Perforce and \
ClearCase by looking for the environment variables named ACCUREV_BIN, \
- P4CLIENT, and CLEARCASE_ROOT respectively.
+ P4CLIENT, and CLEARCASE_ROOT respectively. It detects Git by using \
+ git rev-parse --is-inside-work-tree and will only work if the
current \
+ directory is in a git work tree.
In the first form, tkdiff will present a dialog to allow you to choose the \
files to diff interactively. At present this dialog only supports a \
@@ -6139,17 +6160,26 @@ In the second form, at least one of the
In the remaining forms, cmpREV/cmp (or cmpREV1/cmp and \
cmpREV2/cmp) must be a valid revision number for cmpFILE/cmp. \
- Where AccuRev, RCS, CVS, Subversion, SCCS, PVCS or
