rpm/quilt
SHA256
1
0
Fork 0
forked from pool/quilt
Code Pull Requests Activity

Accepting request 428090 from devel:tools:scm

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/428090
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quilt?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2016-09-21 16:24:24 +00:00 committed by Git OBS Bridge
commit 9d0c8ed461
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fix-faildiff-test-for-diffutils-3.4.patch Normal file
View File

@ -0,0 +1,26 @@
From: Jean Delvare <jdelvare@suse.de>
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 <jdelvare@suse.de>
---
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.

7
quilt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 9 11:05:04 CEST 2016 - jdelvare@suse.de
- 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.
-------------------------------------------------------------------
Mon Feb 16 17:22:51 CET 2015 - jdelvare@suse.de

4
quilt.spec
View File

@ -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 @@ Patch8: translation-fixes-04.patch
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 @@ http://www.zip.com.au/~akpm/linux/patches/.
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build
# --with-rpmbuild=/usr/lib/rpm/rpmb: