From 3b57a00f063640a46f291f88acbbad966000e249 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 4 Jul 2008 15:00:09 +0200 Subject: [PATCH] Really make fuzz=0 default for patches - and finish the Patch and Source fixup --- build/parsePrep.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build/parsePrep.c b/build/parsePrep.c index 3f3e853..3fcd3ab 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -424,15 +424,14 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line) poptContext optCon; opt_p = opt_R = opt_E = 0; - opt_P = -1; /* no explicit -P was found */ - opt_F = -1; /* fuzz<0 indicates no explicit -F x was set */ + opt_F = 0; /* apply patches with fuzz==0 by default */ opt_b = NULL; /* Convert %patchN to %patch -PN to simplify further processing */ if (! strchr(" \t\n", line[6])) { rasprintf(&buf, "%%patch -P %s", line + 6); } else { - buf = xstrdup(line); + rasprintf(&buf, "%%patch -P %lu %s", INT_MAX, line + 6); /* INT_MAX denotes not numbered %patch */ } poptParseArgvString(buf, &argc, &argv); free(buf); -- 2.7.4