Hello community, here is the log from the commit of package quilt for openSUSE:Factory checked in at 2016-09-21 18:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilt (Old) and /work/SRC/openSUSE:Factory/.quilt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilt" Changes: -------- --- /work/SRC/openSUSE:Factory/quilt/quilt.changes 2015-02-27 11:06:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.quilt.new/quilt.changes 2016-09-21 18:24:26.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 9 11:05:04 CEST 2016 - [email protected] + +- fix-faildiff-test-for-diffutils-3.4.patch: Since diffutils + version 3.4, diff no longer returns an error code for binary + files. Remove this test from faildiff.test. + +------------------------------------------------------------------- New: ---- fix-faildiff-test-for-diffutils-3.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilt.spec ++++++ --- /var/tmp/diff_new_pack.mcZnwD/_old 2016-09-21 18:24:28.000000000 +0200 +++ /var/tmp/diff_new_pack.mcZnwD/_new 2016-09-21 18:24:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package quilt # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -50,6 +50,7 @@ Patch9: edit-01-test-file-creation.patch Patch10: edit-02-call-remove-not-revert.patch Patch11: edit-03-fix-corner-case.patch +Patch12: fix-faildiff-test-for-diffutils-3.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %if 0%{?suse_version} @@ -82,6 +83,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build # --with-rpmbuild=/usr/lib/rpm/rpmb: ++++++ fix-faildiff-test-for-diffutils-3.4.patch ++++++ From: Jean Delvare <[email protected]> Subject: faildiff.test: Fix for diffutils 3.4 and later Since diffutils version 3.4, diff no longer returns an error code for binary files. Remove this test from faildiff.test. Signed-off-by: Jean Delvare <[email protected]> --- test/faildiff.test | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) --- quilt.orig/test/faildiff.test 2016-09-09 10:16:05.709530299 +0200 +++ quilt/test/faildiff.test 2016-09-09 10:39:16.914180640 +0200 @@ -29,10 +29,5 @@ What happens on binary files? $ printf "\\003\\000\\001" > test.bin $ quilt diff -pab --no-index >~ (Files|Binary files) a/test\.bin and b/test\.bin differ - $ echo %{?} - > 1 - - $ quilt refresh - > Diff failed on file 'test.bin', aborting - $ echo %{?} - > 1 + # Since diffutils version 3.4, diff no longer returns an error + # code for binary files, so we don't test it here.
