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.changes 2011-11-29 12:52:44.000000000 +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 - [email protected] + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Nov 13 15:45:27 UTC 2017 - [email protected] + +- 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 <file1> <file2> # # Plain file with conflict markers: # tkdiff -conflict <file> # # Source control AccuRev/CVS/RCS/Perforce/PVCS/SCCS: # tkdiff <file> (same as -r) # tkdiff -r <file> # tkdiff -r<rev> <file> # tkdiff -r<rev> -r <file> # tkdiff -r<rev1> -r<rev2> <file> # # Options: # -a <ancestor_file> # -o <merge output file> # # 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. ###############################################################################
