RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 19-Jun-2007 15:48:45 Branch: HEAD Handle: 2007061914484400 Modified files: rpm/build parsePrep.c Log: handle %patch -Fn as well as %patch -F n. Summary: Revision Changes Path 2.72 +3 -1 rpm/build/parsePrep.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/build/parsePrep.c ============================================================================ $ cvs diff -u -r2.71 -r2.72 parsePrep.c --- rpm/build/parsePrep.c 18 Jun 2007 16:50:36 -0000 2.71 +++ rpm/build/parsePrep.c 19 Jun 2007 13:48:44 -0000 2.72 @@ -507,8 +507,10 @@ } } else if (!strcmp(s, "-F")) { /* fuzz factor */ - const char * fnum = strtok(NULL, " \t\n"); + const char * fnum = (!strchr(" \t\n", s[2]) + ? s+2 : strtok(NULL, " \t\n")); char * end = NULL; + opt_F = (fnum ? strtol(fnum, &end, 10) : 0); if (! opt_F || *end) { rpmError(RPMERR_BADSPEC, @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org