Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2017-09-11 16:22:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Mon Sep 11 16:22:55 2017 rev:21 rq:523007 version:1.0.18 Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2016-01-01 19:49:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2017-09-11 16:23:36.357834474 +0200 @@ -1,0 +2,9 @@ +Sun Sep 10 15:41:24 UTC 2017 - [email protected] + +- Update to 1.0.18: + * Ensure --color=no is honoured where appropriate, add + --color-term-output-only plus minor fixes. + * Fix regression which broke piping to less. +- Cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- colordiff-1.0.16.tar.gz colordiff-1.0.16.tar.gz.sig New: ---- colordiff-1.0.18.tar.gz colordiff-1.0.18.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.KkH4OM/_old 2017-09-11 16:23:36.849765399 +0200 +++ /var/tmp/diff_new_pack.KkH4OM/_new 2017-09-11 16:23:36.853764837 +0200 @@ -1,7 +1,7 @@ # # spec file for package colordiff # -# Copyright (c) 2015 SUSE LINUX 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 @@ -17,7 +17,7 @@ Name: colordiff -Version: 1.0.16 +Version: 1.0.18 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0+ @@ -27,7 +27,6 @@ Source1: http://www.colordiff.org/%{name}-%{version}.tar.gz.sig Source2: %{name}.keyring Patch0: colordiff-fix-permission.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -52,7 +51,6 @@ chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* %files -%defattr(-,root,root) %doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg %config %{_sysconfdir}/colordiffrc %{_bindir}/cdiff ++++++ colordiff-1.0.16.tar.gz -> colordiff-1.0.18.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.16/CHANGES new/colordiff-1.0.18/CHANGES --- old/colordiff-1.0.16/CHANGES 2015-10-25 16:04:01.000000000 +0100 +++ new/colordiff-1.0.18/CHANGES 2017-06-02 21:41:16.000000000 +0200 @@ -132,5 +132,14 @@ Support for XDG_CONFIG_HOME (thanks Zhiming Wang), fewer deps for cdiff.sh and fixes for diffy and diff-type specification (thanks Peter Wu). +Changes between 1.0.16 and 1.0.17 + +Ensure --color=no is honoured where appropriate, add --color-term-output-only +plus minor fixes. + +Changes between 1.0.17 and 1.0.18 + +Fix regression which broke piping to less. + # vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.16/Makefile new/colordiff-1.0.18/Makefile --- old/colordiff-1.0.16/Makefile 2015-06-23 22:35:04.000000000 +0200 +++ new/colordiff-1.0.18/Makefile 2016-11-12 13:12:14.000000000 +0100 @@ -1,6 +1,6 @@ -INSTALL_DIR=/usr/local/bin -MAN_DIR=/usr/local/man/man1 -ETC_DIR=/etc +INSTALL_DIR?=/usr/local/bin +MAN_DIR?=/usr/local/man/man1 +ETC_DIR?=/etc 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 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.16/colordiff.pl new/colordiff-1.0.18/colordiff.pl --- old/colordiff-1.0.16/colordiff.pl 2015-10-25 15:54:32.000000000 +0100 +++ new/colordiff-1.0.18/colordiff.pl 2017-06-02 21:41:27.000000000 +0200 @@ -5,7 +5,7 @@ # ColorDiff - a wrapper/replacement for 'diff' producing # # colourful output # # # -# Copyright (C)2002-2015 Dave Ewart ([email protected]) # +# Copyright (C)2002-2017 Dave Ewart ([email protected]) # # # ######################################################################## # # @@ -25,13 +25,13 @@ use Getopt::Long qw(:config pass_through no_auto_abbrev); my $app_name = 'colordiff'; -my $version = '1.0.16'; +my $version = '1.0.18'; my $author = 'Dave Ewart'; my $author_email = '[email protected]'; my $app_www = 'http://www.colordiff.org/'; -my $copyright = '(C)2002-2015'; +my $copyright = '(C)2002-2017'; my $show_banner = 1; -my $color_patch = 0; +my $color_patch = undef; my $diff_cmd = "diff"; # ANSI sequences for colours @@ -92,7 +92,7 @@ my $nonopts = 0; my $ddash = 0; - while (my $arg = shift) { + while (defined(my $arg = shift)) { if ($arg eq "--") { $ddash = 1; next; @@ -165,13 +165,15 @@ my $specified_difftype; my $enable_fakeexitcode; my $color_mode = "auto"; +my $color_term_output_only = "no"; GetOptions( # --enable-verifymode option is for testing behaviour of colordiff # against standard test diffs "verifymode" => \$enable_verifymode, "fakeexitcode" => \$enable_fakeexitcode, "difftype=s" => \$specified_difftype, - "color=s" => \$color_mode + "color=s" => \$color_mode, + "color-term-output-only=s" => \$color_term_output_only ); $_ = $specified_difftype; @@ -210,6 +212,8 @@ if ($setting eq 'color_patches') { if ($value eq 'yes') { $color_patch = 1; + } elsif ($value eq 'no') { + $color_patch = 0; } next; } @@ -264,17 +268,21 @@ } } -# --color=yes and --color=no will override the color_patches setting +# --color=(yes|no|auto) will override the color_patches setting if ($color_mode eq "yes") { $color_patch = 1; } elsif ($color_mode eq "no") { $color_patch = 0; +} elsif ($color_mode eq "auto") { + $color_patch = undef; } -# If output is to a file, switch off colours, unless 'color_patch' is set, -# which might be due to --color=no being specified +# If output is to a file, switch off colours unless overriden by $color_patch. # Relates to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=378563 -if ((-f STDOUT) && ($color_patch == 0)) { +# Relates to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=862878 +if ( (!$color_patch && (defined $color_patch || -f STDOUT)) || + ($color_term_output_only eq 'yes' && !-t STDOUT) ) +{ $plain_text = ''; $file_old = ''; $file_new = '';
