Hello community, here is the log from the commit of package colordiff for openSUSE:Factory checked in at 2016-01-01 19:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colordiff (Old) and /work/SRC/openSUSE:Factory/.colordiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "colordiff" Changes: -------- --- /work/SRC/openSUSE:Factory/colordiff/colordiff.changes 2015-08-07 00:24:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.colordiff.new/colordiff.changes 2016-01-01 19:49:41.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 25 14:03:43 UTC 2015 - mplus...@suse.com + +- Update to 1.0.16 + * see attached CHANGES for details +- Add gpg signature + +------------------------------------------------------------------- Old: ---- colordiff-1.0.15.tar.gz New: ---- colordiff-1.0.16.tar.gz colordiff-1.0.16.tar.gz.sig colordiff.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colordiff.spec ++++++ --- /var/tmp/diff_new_pack.VpTe1S/_old 2016-01-01 19:49:43.000000000 +0100 +++ /var/tmp/diff_new_pack.VpTe1S/_new 2016-01-01 19:49:43.000000000 +0100 @@ -17,13 +17,15 @@ Name: colordiff -Version: 1.0.15 +Version: 1.0.16 Release: 0 Summary: Colour-highlighted 'diff' output License: GPL-2.0+ Group: Productivity/Text/Utilities Url: http://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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -41,19 +43,21 @@ %install mkdir -p %{buildroot}/%{_bindir} -mkdir -p %{buildroot}/etc -make INSTALL_DIR=%{buildroot}/%{_bindir} \ +mkdir -p %{buildroot}/%{_sysconfdir} +make \ + INSTALL_DIR=%{buildroot}/%{_bindir} \ MAN_DIR=%{buildroot}/%{_mandir}/man1 \ - ETC_DIR=%{buildroot}/etc install -gzip %{buildroot}/%{_mandir}/man1/*.1 + ETC_DIR=%{buildroot}%{_sysconfdir} install sed -i -e "s@%{buildroot}@@" %{buildroot}/%{_bindir}/colordiff chmod a-x %{buildroot}/%{_mandir}/man1/colordiff.* %files %defattr(-,root,root) %doc README COPYING CHANGES BUGS colordiffrc colordiffrc-lightbg -%{_bindir}/* -%{_mandir}/man1/* %config %{_sysconfdir}/colordiffrc +%{_bindir}/cdiff +%{_bindir}/colordiff +%{_mandir}/man1/cdiff.1%{?ext_man} +%{_mandir}/man1/colordiff.1%{?ext_man} %changelog ++++++ colordiff-1.0.15.tar.gz -> colordiff-1.0.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.15/CHANGES new/colordiff-1.0.16/CHANGES --- old/colordiff-1.0.15/CHANGES 2015-06-23 22:36:28.000000000 +0200 +++ new/colordiff-1.0.16/CHANGES 2015-10-25 16:04:01.000000000 +0100 @@ -127,5 +127,10 @@ Missed gitdiff file from tarball, bumping version number for clarity. +Changes between 1.0.15 and 1.0.16 + +Support for XDG_CONFIG_HOME (thanks Zhiming Wang), fewer deps for cdiff.sh and +fixes for diffy and diff-type specification (thanks Peter Wu). + # vim: tw=72 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.15/cdiff.sh new/colordiff-1.0.16/cdiff.sh --- old/colordiff-1.0.15/cdiff.sh 2012-10-17 22:14:35.000000000 +0200 +++ new/colordiff-1.0.16/cdiff.sh 2015-06-25 15:37:54.000000000 +0200 @@ -2,7 +2,7 @@ # cdiff.sh - Convenience wrapper for colordiff # -# Copyright (C) 2003-2009 Ville Skyttä <ville.sky...@iki.fi> +# Copyright (C) 2003-2015 Ville Skyttä <ville.sky...@iki.fi> # Based on cdiff version 1.4 by eiv...@freebsd.org # # This program is free software; you can redistribute it and/or @@ -30,15 +30,15 @@ case `echo "$file" | perl -ne 'print lc $_'` in http:*|https:*|ftp:*) if [ -z "$CDIFF_FETCH" ]; then - if which curl >/dev/null 2>&1; then + if type curl >/dev/null 2>&1; then CDIFF_FETCH="curl -s" - elif which wget >/dev/null 2>&1; then + elif type wget >/dev/null 2>&1; then CDIFF_FETCH="wget -e timestamping=off -qO -" - elif which lwp-request >/dev/null 2>&1; then + elif type lwp-request >/dev/null 2>&1; then CDIFF_FETCH="lwp-request -m GET" - elif which lynx >/dev/null 2>&1; then + elif type lynx >/dev/null 2>&1; then CDIFF_FETCH="lynx -source" - elif which elinks >/dev/null 2>&1; then + elif type elinks >/dev/null 2>&1; then CDIFF_FETCH="elinks -source" fi if [ -z "$CDIFF_FETCH" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colordiff-1.0.15/colordiff.pl new/colordiff-1.0.16/colordiff.pl --- old/colordiff-1.0.15/colordiff.pl 2015-06-23 22:36:36.000000000 +0200 +++ new/colordiff-1.0.16/colordiff.pl 2015-10-25 15:54:32.000000000 +0100 @@ -25,7 +25,7 @@ use Getopt::Long qw(:config pass_through no_auto_abbrev); my $app_name = 'colordiff'; -my $version = '1.0.15'; +my $version = '1.0.16'; my $author = 'Dave Ewart'; my $author_email = 'da...@sungate.co.uk'; my $app_www = 'http://www.colordiff.org/'; @@ -66,6 +66,12 @@ my $etcdir = '/etc'; my ($setting, $value); my @config_files = ("$etcdir/colordiffrc"); +if (defined $ENV{XDG_CONFIG_HOME} && $ENV{XDG_CONFIG_HOME} ne '') { + push (@config_files, "$ENV{XDG_CONFIG_HOME}/colordiff/colordiffrc") +} +elsif (defined $ENV{HOME}) { + push (@config_files, "$ENV{HOME}/.config/colordiff/colordiffrc") +} push (@config_files, "$ENV{HOME}/.colordiffrc") if (defined $ENV{HOME}); my $config_file; my $diff_type = 'unknown'; @@ -166,9 +172,13 @@ "fakeexitcode" => \$enable_fakeexitcode, "difftype=s" => \$specified_difftype, "color=s" => \$color_mode - # TODO - check that specified type is valid, issue warning if not ); +$_ = $specified_difftype; +if (defined $_ and not /^diff[cuy]?|(deb|w)diff$/) { + print STDERR "Invalid --difftype value\n"; +} + if (defined $enable_verifymode) { # When in verify mode, to ensure consistent output we don't source # any external config files, so we use built-in defaults @@ -308,16 +318,21 @@ # Input stream has been read - need to examine it # to determine type of diff we have. -my $lastline; +# $lastline is false if the input is EOF. If true, then either more data is +# available, or the last read succeeded (and the next read may return EOF). +# Initially assume that the input is not EOF (for obvious reasons). +my $lastline = 1; my $record; if (defined $specified_difftype) { $diff_type = $specified_difftype; # diffy needs at least one line to look at - if ($diff_type eq 'diffy' and ($_ = <$inputhandle>)) { - push @inputstream, $_; + if ($diff_type eq 'diffy') { + if (defined($_ = <$inputhandle>)) { + push @inputstream, $_; + } + $lastline = $_; } - $lastline = $_; } else { # Detect diff type, diffy is permitted
