Hello community, here is the log from the commit of package tkdiff checked in at Tue Nov 27 18:08:59 CET 2007. -------- --- tkdiff/tkdiff.changes 2006-08-11 10:30:51.000000000 +0200 +++ /mounts/work_src_done/NOARCH/tkdiff/tkdiff.changes 2007-11-27 15:42:26.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 27 15:37:56 CET 2007 - lmichnovic@suse.cz + +- update to version 4.1.4 +* Ignore -u option from svn for usage "svn diff --diff-cmd=tkdiff" +* Perforce support for P4CONFIG environment variable +* Remove an old font work-around for Mac, but add a new one for tk8.5 + on Windows +* Fix duplicate keyboard accelerator for Preferences + + +------------------------------------------------------------------- Old: ---- tkdiff-4.1.3-unix.tar.bz2 New: ---- tkdiff-4.1.4-unix.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tkdiff.spec ++++++ --- /var/tmp/diff_new_pack.H29110/_old 2007-11-27 18:07:55.000000000 +0100 +++ /var/tmp/diff_new_pack.H29110/_new 2007-11-27 18:07:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package tkdiff (Version 4.1.3) +# spec file for package tkdiff (Version 4.1.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -11,16 +11,16 @@ # norootforbuild Name: tkdiff -%define real_version 4.1.3-unix -BuildArchitectures: noarch -License: GPL +%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.3 -Release: 2 +AutoReqProv: on +Version: 4.1.4 +Release: 1 Summary: 2 and 3-way diff/merge tool -URL: http://tkdiff.sourceforge.net/ +Url: http://tkdiff.sourceforge.net/ Source0: %{name}-%{real_version}.tar.bz2 Source1: README.SuSE BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,7 @@ John M. Klassa <klassa@ipass.net> %prep -%setup -n tkdiff-4.1.3-unix +%setup -n tkdiff-4.1.4-unix # cp %{S:1} . @@ -50,7 +50,14 @@ %doc README.SuSE /usr/bin/tkdiff -%changelog -n tkdiff +%changelog +* Tue Nov 27 2007 - lmichnovic@suse.cz +- update to version 4.1.4 + * Ignore -u option from svn for usage "svn diff --diff-cmd=tkdiff" + * Perforce support for P4CONFIG environment variable + * Remove an old font work-around for Mac, but add a new one for tk8.5 + on Windows + * Fix duplicate keyboard accelerator for Preferences * Fri Aug 11 2006 - lmichnovic@suse.cz - changed bindir to /usr/bin * Tue Jun 20 2006 - lmichnovic@suse.cz ++++++ tkdiff-4.1.3-unix.tar.bz2 -> tkdiff-4.1.4-unix.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tkdiff-4.1.3-unix/Changelog new/tkdiff-4.1.4-unix/Changelog --- old/tkdiff-4.1.3-unix/Changelog 2006-02-20 21:15:43.000000000 +0100 +++ new/tkdiff-4.1.4-unix/Changelog 2007-11-15 07:52:48.000000000 +0100 @@ -1,3 +1,10 @@ +4.1.4 (11/15/2007): + * Ignore -u option from svn for usage "svn diff --diff-cmd=tkdiff" + * Perforce support for P4CONFIG environment variable + * Remove an old font work-around for Mac, but add a new one for tk8.5 + on Windows + * Fix duplicate keyboard accelerator for Preferences + 4.1.3 (2/20/2006): * Fixed incompatibility with older versions of Tcl/Tk ("-state disabled"). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tkdiff-4.1.3-unix/tkdiff new/tkdiff-4.1.4-unix/tkdiff --- old/tkdiff-4.1.3-unix/tkdiff 2006-02-19 20:56:26.000000000 +0100 +++ new/tkdiff-4.1.4-unix/tkdiff 2007-11-15 07:52:48.000000000 +0100 @@ -42,7 +42,7 @@ # set a couple o' globals that we might need sooner than later set g(name) "TkDiff" -set g(version) "4.1.3" +set g(version) "4.1.4" set g(started) 0 # FIXME - move to preferences @@ -136,24 +136,22 @@ # selected color (rh8 with tk 8.3.3-74) "#c3c3c3" set w(selcolor) "#b03060" -# Make sure fon size is specified in points not pixels. AquaTk doesn't. -if {! [regexp -- {-} $labelfont]} { - regsub { (\d+)} $labelfont { -\1} labelfont -} -if {! [regexp -- {-} $menufont]} { - regsub { (\d+)} $menufont { -\1} menufont -} -if {! [regexp -- {-} $textfont]} { - regsub { (\d+)} $textfont { -\1} textfont -} -if {! [regexp -- {-} $entryfont]} { - regsub { (\d+)} $entryfont { -\1} entryfont -} #debug-info "menufont $menufont" #debug-info "labelfont $labelfont" #debug-info "textfont $textfont" #debug-info "entryfont $entryfont" +set fs [lindex $textfont 1] +if {$fs == ""} { + # This happens on Windows in tk8.5 + # You get {TkDefaultFont} instead of {fixed 12} or whatever + # Then when you add "bold" to it you have a bad spec + set fa [font actual $textfont] + puts " actual font: $fa" + set fm [lindex $fa 1] + set fs [lindex $fa 3] + set textfont [list $fm $fs] +} set font [list $textfont] set bold [list [concat $textfont bold]] #debug-info "font: $font" @@ -790,12 +788,12 @@ if {"$r" == "" || "$rev" == "rBASE"} { set finfo(lbl,$index) "$f (SVN BASE)" debug-info " Setting lbl $finfo(lbl,$index)" - die-unless "exec cat $dirname/.svn/text-base/$tailname.svn-base" \ + die-unless "exec cat "$dirname/.svn/text-base/$tailname.svn-base"" \ $finfo(pth,$index) } else { set finfo(lbl,$index) "$f (SVN $rev)" debug-info " Setting lbl $finfo(lbl,$index)" - die-unless "exec $cmd cat $svnopt $f" $finfo(pth,$index) + die-unless "exec $cmd cat $svnopt "$f"" $finfo(pth,$index) } } elseif {[regexp {://} $f]} { # Subversion command can have the form @@ -856,7 +854,7 @@ debug-info " Setting lbl $finfo(lbl,$index)" die-unless "exec $cmd -p $pvcsopt "$f"" ""$finfo(pth,$index)"" filterCRCRLF $finfo(pth,$index) - } elseif {[info exists ::env(P4CLIENT)]} { + } elseif {[info exists ::env(P4CLIENT)] || [info exists ::env(P4CONFIG)]} { set cmd "p4" if {$::tcl_platform(platform) == "windows"} { append cmd ".exe" @@ -1028,6 +1026,9 @@ "^-o.*" { set g(mergefile) [string range $arg 2 end] } + "^-u$" { + # Ignore flag from "svn diff --diff-cmd=tkdiff" + } "^-psn" { # Ignore the Carbon Process Serial Number set argv [lreplace $argv $argindex $argindex] @@ -2195,7 +2196,7 @@ do-edit } -underline 10 $editMenu add separator - $editMenu add command -label "Preferences..." -underline 3 \ + $editMenu add command -label "Preferences..." -underline 0 \ -command customize set "g(tooltip,Copy)" "Copy the currently selected text to the clipboard" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org