teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.13.0-patch-flags.patch

Lubos Kardos 20d5c6
From 66a6082634687e45b321a5ade9887420d5830162 Mon Sep 17 00:00:00 2001
Lubos Kardos 20d5c6
From: Lubos Kardos <lkardos@redhat.com>
Lubos Kardos 20d5c6
Date: Fri, 15 Apr 2016 10:47:57 +0200
Lubos Kardos 20d5c6
Subject: [PATCH 1/2] Add %{_default_patch_flags} to %__patch which is used in
Lubos Kardos 20d5c6
 %autosetup
Lubos Kardos 20d5c6
Lubos Kardos 20d5c6
%{_default_patch_flags} is used in %patch spec directive and now it is
Lubos Kardos 20d5c6
used also in %__patch macro which is used in %autosetup macro. This make
Lubos Kardos 20d5c6
consitent using newer %autosetup macro and older %patch directives.
Lubos Kardos 20d5c6
---
Lubos Kardos 20d5c6
 macros.in | 2 +-
Lubos Kardos 20d5c6
 1 file changed, 1 insertion(+), 1 deletion(-)
Lubos Kardos 20d5c6
Lubos Kardos 20d5c6
diff --git a/macros.in b/macros.in
Lubos Kardos 20d5c6
index ce252d4..bbff0c1 100644
Lubos Kardos 20d5c6
--- a/macros.in
Lubos Kardos 20d5c6
+++ b/macros.in
Lubos Kardos 20d5c6
@@ -1085,7 +1085,7 @@ done \
Lubos Kardos 20d5c6
 # Plain patch (-m is unused)
Lubos Kardos 20d5c6
 %__scm_setup_patch(q) %{nil}
Lubos Kardos 20d5c6
 %__scm_apply_patch(qp:m:)\
Lubos Kardos 20d5c6
-%{__patch} %{-p:-p%{-p*}} %{-q:-s} --fuzz=%{_default_patch_fuzz}
Lubos Kardos 20d5c6
+%{__patch} %{-p:-p%{-p*}} %{-q:-s} --fuzz=%{_default_patch_fuzz} %{_default_patch_flags}
Lubos Kardos 20d5c6
 
Lubos Kardos 20d5c6
 # Mercurial (aka hg)
Lubos Kardos 20d5c6
 %__scm_setup_hg(q)\
Lubos Kardos 20d5c6
-- 
Lubos Kardos 20d5c6
1.9.3
Lubos Kardos 20d5c6