From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 21 Apr 2008 08:13:13 +0000 (+0300)
Subject: Avoid %patch0 getting applied twice
X-Git-Tag: rpm-4.6.0-rc1~787
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fc06030b80f3b7c2f6d5dd80d65091c19b70b22;p=platform%2Fupstream%2Frpm.git

Avoid %patch0 getting applied twice
---

diff --git a/build/parsePrep.c b/build/parsePrep.c
index c686321..ff51ff5 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -428,7 +428,8 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
     };
     poptContext optCon;
 
-    opt_P = opt_p = opt_R = opt_E = 0;
+    opt_p = opt_R = opt_E = 0;
+    opt_P = -1;		/* no explicit -P <N> was found */
     opt_F = -1;		/* fuzz<0 indicates no explicit -F x was set */
     opt_b = NULL;
 
@@ -468,7 +469,7 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
     }
 
     /* %patch without -P<N> is treated as %patch0, urgh */
-    if (!opt_P) {
+    if (opt_P < 0) {
 	argvAdd(&patchnums, "0");
     }
     /* Any trailing arguments are treated as patch numbers */