Attachment 312831 Details for Bug 456636 – another patch

[patch] another patch

rpm-default-fuzz.patch (text/plain), 1.75 KB, created by Tom Lane on 2008-07-28 23:48:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Lane

Created: 2008-07-28 23:48:13 UTC

Size: 1.75 KB

patch

obsolete

>diff -Naur rpm-4.4.2.3.orig/build/parsePrep.c rpm-4.4.2.3/build/parsePrep.c
>--- rpm-4.4.2.3.orig/build/parsePrep.c	2008-04-01 03:28:21.000000000 -0400
>+++ rpm-4.4.2.3/build/parsePrep.c	2008-07-28 16:20:03.000000000 -0400
>@@ -61,7 +61,7 @@
>  * @param strip		patch level (i.e. patch -p argument)
>  * @param db		saved file suffix (i.e. patch --suffix argument)
>  * @param reverse	include -R?
>- * @param fuzz		include -F?
>+ * @param fuzz		fuzz factor, fuzz<0 means no fuzz set
>  * @param removeEmpties	include -E?
>  * @return		expanded %patch macro (NULL on error)
>  */
>@@ -98,7 +98,7 @@
> #endif
> 	t = stpcpy( stpcpy(t, "--suffix "), db);
>     }
>-    if (fuzz) {
>+    if (fuzz>=0) {
> 	t = stpcpy(t, " -F");
> 	sprintf(t, "%d", fuzz);
> 	t += strlen(t);
>@@ -463,7 +463,8 @@
>     int patch_index, x;
> 
>     memset(patch_nums, 0, sizeof(patch_nums));
>-    opt_P = opt_p = opt_R = opt_E = opt_F = 0;
>+    opt_P = opt_p = opt_R = opt_E = 0;
>+    opt_F = rpmExpandNumeric("%{_default_patch_fuzz}");		/* get default fuzz factor for %patch */
>     opt_b = NULL;
>     patch_index = 0;
> 
>@@ -515,7 +516,7 @@
> 		fnum = strtok(NULL, " \t\n");
> 	    }
> 	    opt_F = (fnum ? strtol(fnum, &end, 10) : 0);
>-	    if (! opt_F || *end) {
>+	    if (opt_F < 0 || *end) {
> 		rpmError(RPMERR_BADSPEC,
> 			_("line %d: Bad arg to %%patch -F: %s\n"),
> 			spec->lineNum, spec->line);
>diff -Naur rpm-4.4.2.3.orig/macros.in rpm-4.4.2.3/macros.in
>--- rpm-4.4.2.3.orig/macros.in	2008-04-01 03:28:22.000000000 -0400
>+++ rpm-4.4.2.3/macros.in	2008-07-28 16:21:42.000000000 -0400
>@@ -340,6 +340,9 @@
> #
> #%vendor
> 
>+#	Default fuzz level for %patch in spec file (-1 means don't set it).
>+%_default_patch_fuzz	-1
>+
> #==============================================================================
> # ---- Build configuration macros.
> #

Actions: View | Diff

Attachments on bug 456636: 312626 | 312831