From 85aace6492f4542eb97daa30c62605161de58a97ae244c5cd57bf7fcac1799c4 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.com>
Date: Thu, 3 May 2018 06:59:27 +0000
Subject: [PATCH] - quiltrc-support-all-patch-formats-by-default.patch:
 quiltrc:   Support all patch formats by default (bsc#1088281).

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=117
---
 quilt.changes                                 |  6 ++++
 quilt.spec                                    |  4 ++-
 ...support-all-patch-formats-by-default.patch | 30 +++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 quiltrc-support-all-patch-formats-by-default.patch

diff --git a/quilt.changes b/quilt.changes
index 6d68c45..544dce6 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May  3 08:53:20 CEST 2018 - jdelvare@suse.de
+
+- quiltrc-support-all-patch-formats-by-default.patch: quiltrc:
+  Support all patch formats by default (bsc#1088281).
+
 -------------------------------------------------------------------
 Sun Sep 24 10:00:18 UTC 2017 - coolo@suse.com
 
diff --git a/quilt.spec b/quilt.spec
index 4d790a5..efa262e 100644
--- a/quilt.spec
+++ b/quilt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package quilt
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -45,6 +45,7 @@ Patch4:         suse-workaround-pseudo-release.patch
 Patch5:         mail-fix-patch-set-threading.patch
 Patch6:         quilt-translations.patch
 Patch7:         perl-526.patch
+Patch8:         quiltrc-support-all-patch-formats-by-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 %if 0%{?suse_version}
@@ -70,6 +71,7 @@ un-applied, refreshed, and more.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 # --with-rpmbuild=/usr/lib/rpm/rpmb:
diff --git a/quiltrc-support-all-patch-formats-by-default.patch b/quiltrc-support-all-patch-formats-by-default.patch
new file mode 100644
index 0000000..a93f10c
--- /dev/null
+++ b/quiltrc-support-all-patch-formats-by-default.patch
@@ -0,0 +1,30 @@
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 3 May 2018 08:33:24 +0200
+Subject: quiltrc: Support all patch formats by default
+Git-commit: 6d2c0da841aeaaec60993441bf6899f1909f310d
+Patch-mainline: yes
+References: bsc#1088281
+
+Passing --unified to patch by default prevents using other patch
+formats. Out of curiosity, I checked if it helped with performance
+but was not able to measure any improvement. So stop passing
+--unified by default.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+
+diff --git a/quilt.quiltrc b/quilt.quiltrc
+index 58f665e..f0ec21e 100644
+--- a/quilt.quiltrc
++++ b/quilt.quiltrc
+@@ -3,10 +3,8 @@
+ # Options passed to GNU diff when generating patches
+ QUILT_DIFF_OPTS="--show-c-function"
+ 
+-# Options passed to GNU patch when applying patches.
+-# (For appling patches which are not in unified format, remove the "--unified".)
++# Options passed to GNU patch when applying patches
+ #QUILT_PATCH_OPTS="--ignore-whitespace"
+-QUILT_PATCH_OPTS="--unified"
+ 
+ # Options passed to diffstat when generating patch statistics
+ #QUILT_DIFFSTAT_OPTS="-f0"