Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2020-07-15 15:04:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Wed Jul 15 15:04:10 2020 rev:22 rq:820781 version:1.0.19 Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2017-09-11 16:23:36.357834474 +0200 +++ /work/SRC/openSUSE:Factory/.colordiff.new.3060/colordiff.changes 2020-07-15 15:04:35.415384890 +0200 @@ -1,0 +2,12 @@ +Mon Jul 13 08:56:10 UTC 2020 - Matthias Eliasson <eli...@opensuse.org> + +- Update to 1.0.19 + * Add 'difffile' color option, allowing more git-like coloring (separate + color for header of each changed file). Thanks Geraint Edwards. + * Improved portability of Makefile, thanks Michael Osipov. + * Provide support for 24-bit colour strings, thanks Stephen Wall. +- Run spec-cleaner + * Drop package groups +- Drop patch colordiff-fix-permission.diff not needed anymore + +------------------------------------------------------------------- Old: ---- colordiff-1.0.18.tar.gz colordiff-1.0.18.tar.gz.sig colordiff-fix-permission.diff New: ---- colordiff-1.0.19.tar.gz colordiff-1.0.19.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.K9ZlGV/_old 2020-07-15 15:04:36.967386404 +0200 +++ /var/tmp/diff_new_pack.K9ZlGV/_new 2020-07-15 15:04:36.971386407 +0200 @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,19 @@ # 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/ # Name: colordiff -Version: 1.0.18 +Version: 1.0.19 Release: 0 Summary: Colour-highlighted 'diff' output -License: GPL-2.0+ -Group: Productivity/Text/Utilities -Url: http://www.colordiff.org +License: GPL-2.0-or-later +URL: https://www.colordiff.org Source0: http://www.colordiff.org/%{name}-%{version}.tar.gz Source1: http://www.colordiff.org/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring -Patch0: colordiff-fix-permission.diff BuildArch: noarch %description @@ -35,24 +33,19 @@ customized. %prep -%setup -q -%patch0 +%autosetup %build %install -mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/%{_sysconfdir} -make \ - INSTALL_DIR=%{buildroot}/%{_bindir} \ - MAN_DIR=%{buildroot}/%{_mandir}/man1 \ - ETC_DIR=%{buildroot}%{_sysconfdir} install -sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff -chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* +%make_install INSTALL_DIR=%{_bindir} \ + ETC_DIR=%{_sysconfdir} \ + MAN_DIR=%{_mandir}/man1 %files -%doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg -%config %{_sysconfdir}/colordiffrc +%license COPYING +%doc README CHANGES BUGS colordiffrc colordiffrc-lightbg colordiffrc-gitdiff +%config(noreplace) %{_sysconfdir}/colordiffrc %{_bindir}/cdiff %{_bindir}/colordiff %{_mandir}/man1/cdiff.1%{?ext_man} ++++++ colordiff-1.0.18.tar.gz -> colordiff-1.0.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/CHANGES new/colordiff-1.0.19/CHANGES --- old/colordiff-1.0.18/CHANGES 2017-06-02 21:41:16.000000000 +0200 +++ new/colordiff-1.0.19/CHANGES 2020-04-18 12:52:00.000000000 +0200 @@ -141,5 +141,11 @@ Fix regression which broke piping to less. -# vim: tw=72 +Changes between 1.0.18 and 1.0.19 + +Add 'difffile' color option, allowing more git-like coloring (separate color for +header of each changed file). Thanks Geraint Edwards. Improved portability of +Makefile, thanks Michael Osipov. Provide support for 24-bit colour strings, +thanks Stephen Wall. +# vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/Makefile new/colordiff-1.0.19/Makefile --- old/colordiff-1.0.18/Makefile 2016-11-12 13:12:14.000000000 +0100 +++ new/colordiff-1.0.19/Makefile 2020-04-18 12:45:39.000000000 +0200 @@ -1,6 +1,7 @@ INSTALL_DIR?=/usr/local/bin MAN_DIR?=/usr/local/man/man1 ETC_DIR?=/etc +INSTALL?=install VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'") DIST_FILES=COPYING INSTALL Makefile README \ colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES colordiff.1 \ @@ -21,23 +22,22 @@ .PHONY: install install: - install -d ${DESTDIR}${INSTALL_DIR} + $(INSTALL) -d ${DESTDIR}${INSTALL_DIR} sed -e "s%/etc%${ETC_DIR}%g" colordiff.pl > \ ${DESTDIR}${INSTALL_DIR}/colordiff chmod +x ${DESTDIR}${INSTALL_DIR}/colordiff if [ ! -f ${DESTDIR}${INSTALL_DIR}/cdiff ] ; then \ - install cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \ + $(INSTALL) cdiff.sh ${DESTDIR}${INSTALL_DIR}/cdiff; \ fi - install -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1 - install -Dm 644 cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1 + $(INSTALL) -Dm 644 colordiff.1 ${DESTDIR}${MAN_DIR}/colordiff.1 + $(INSTALL) -Dm 644 cdiff.1 ${DESTDIR}${MAN_DIR}/cdiff.1 if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc ]; then \ mv -f ${DESTDIR}${ETC_DIR}/colordiffrc \ ${DESTDIR}${ETC_DIR}/colordiffrc.old; \ else \ - install -d ${DESTDIR}${ETC_DIR}; \ + $(INSTALL) -d ${DESTDIR}${ETC_DIR}; \ fi cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc - -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc .PHONY: uninstall diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/colordiff.pl new/colordiff-1.0.19/colordiff.pl --- old/colordiff-1.0.18/colordiff.pl 2017-06-02 21:41:27.000000000 +0200 +++ new/colordiff-1.0.19/colordiff.pl 2020-04-18 12:49:43.000000000 +0200 @@ -5,7 +5,7 @@ # ColorDiff - a wrapper/replacement for 'diff' producing # # colourful output # # # -# Copyright (C)2002-2017 Dave Ewart (da...@sungate.co.uk) # +# Copyright (C)2002-2020 Dave Ewart (da...@sungate.co.uk) # # # ######################################################################## # # @@ -25,11 +25,11 @@ use Getopt::Long qw(:config pass_through no_auto_abbrev); my $app_name = 'colordiff'; -my $version = '1.0.18'; +my $version = '1.0.19'; my $author = 'Dave Ewart'; my $author_email = 'da...@sungate.co.uk'; my $app_www = 'http://www.colordiff.org/'; -my $copyright = '(C)2002-2017'; +my $copyright = '(C)2002-2020'; my $show_banner = 1; my $color_patch = undef; my $diff_cmd = "diff"; @@ -59,6 +59,7 @@ my $file_old = $colour{red}; my $file_new = $colour{blue}; my $diff_stuff = $colour{magenta}; +my $diff_file = $diff_stuff; my $cvs_stuff = $colour{green}; # Locations for personal and system-wide colour configurations @@ -226,7 +227,16 @@ if (($value eq 'normal') || ($value eq 'none')) { $value = 'off'; } - if ($value =~ m/[0-9]+/ && $value >= 0 && $value <= 255) { + # Find full 24-bit colour spec string + if (( $value =~ m/^([0-9];)*([34]8);2;([0-9]+);([0-9]+);([0-9]+)$/) && + ($3 >= 0) && ($3 <= 255) && + ($4 >= 0) && ($4 <= 255) && + ($5 >= 0) && ($5 <= 255) + ) { + $colourval = "\033[$1$2;2;$3;$4;$5m"; + } + # 256 colour single value + elsif ($value =~ m/^[0-9]+$/ && $value >= 0 && $value <= 255) { # Numeric color if( $value < 8 ) { $colourval = "\033[0;3${value}m"; @@ -257,6 +267,9 @@ elsif ($setting eq 'diffstuff') { $diff_stuff = $colourval; } + elsif ($setting eq 'difffile') { + $diff_file = $colourval; + } elsif ($setting eq 'cvsstuff') { $cvs_stuff = $colourval; } @@ -268,10 +281,10 @@ } } -# --color=(yes|no|auto) will override the color_patches setting -if ($color_mode eq "yes") { +# --color=(yes|no|always|never|auto) will override the color_patches setting +if ($color_mode eq "yes" || $color_mode eq "always") { $color_patch = 1; -} elsif ($color_mode eq "no") { +} elsif ($color_mode eq "no" || $color_mode eq "never") { $color_patch = 0; } elsif ($color_mode eq "auto") { $color_patch = undef; @@ -286,6 +299,7 @@ $plain_text = ''; $file_old = ''; $file_new = ''; + $diff_file = ''; $diff_stuff = ''; $cvs_stuff = ''; $plain_text = ''; @@ -462,7 +476,7 @@ print "$cvs_stuff"; } elsif (/^Only in/) { - print "$diff_stuff"; + print "$diff_file"; } else { print "$plain_text"; @@ -476,20 +490,20 @@ print "$file_new"; } elsif (/^\*{4,}/) { - print "$diff_stuff"; + print "$diff_file"; } elsif (/^Only in/) { - print "$diff_stuff"; + print "$diff_file"; } elsif (/^\*\*\* [0-9]+,[0-9]+/) { - print "$diff_stuff"; + print "$diff_file"; $inside_file_old = 1; } elsif (/^\*\*\* /) { print "$file_old"; } elsif (/^--- [0-9]+,[0-9]+/) { - print "$diff_stuff"; + print "$diff_file"; $inside_file_old = 0; } elsif (/^--- /) { @@ -511,7 +525,10 @@ } } elsif ($diff_type eq 'diffu') { - if (/^-/) { + if (/^(---|\+\+\+) /) { + print "$diff_file"; + } + elsif (/^-/) { print "$file_old"; } elsif (/^\+/) { @@ -521,7 +538,7 @@ print "$diff_stuff"; } elsif (/^Only in/) { - print "$diff_stuff"; + print "$diff_file"; } elsif (/^(Index: |={4,}|RCS file: |retrieving |diff )/) { print "$cvs_stuff"; @@ -550,7 +567,7 @@ } } elsif (/^Only in/) { - print "$diff_stuff"; + print "$diff_file"; } else { print "$plain_text"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/colordiffrc new/colordiff-1.0.19/colordiffrc --- old/colordiff-1.0.18/colordiffrc 2014-03-08 20:19:09.000000000 +0100 +++ new/colordiff-1.0.19/colordiffrc 2017-06-20 20:57:50.000000000 +0200 @@ -27,3 +27,4 @@ oldtext=darkred diffstuff=darkcyan cvsstuff=cyan +difffile=white diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/colordiffrc-gitdiff new/colordiff-1.0.19/colordiffrc-gitdiff --- old/colordiff-1.0.18/colordiffrc-gitdiff 2015-05-21 11:13:01.000000000 +0200 +++ new/colordiff-1.0.19/colordiffrc-gitdiff 2017-06-20 20:57:50.000000000 +0200 @@ -28,3 +28,4 @@ oldtext=darkred diffstuff=darkcyan cvsstuff=white +difffile=white diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.18/colordiffrc-lightbg new/colordiff-1.0.19/colordiffrc-lightbg --- old/colordiff-1.0.18/colordiffrc-lightbg 2012-10-17 22:14:35.000000000 +0200 +++ new/colordiff-1.0.19/colordiffrc-lightbg 2017-06-20 20:57:50.000000000 +0200 @@ -27,3 +27,4 @@ oldtext=red diffstuff=darkgreen cvsstuff=darkmagenta +difffile=darkyellow
