Don't let macro '%-x' add extra space between flag and argument

docs/manual/macros.md

@@ -41,6 +41,7 @@ expanded, the following shell-like macros are available:
 | %#     | the number of arguments
 | %{-f}	 | if present at invocation, the last occurence of flag f (flag and argument)
 | %{-f*} |	if present at invocation, the argument to the last occurence of flag f
+| %f{-f**} | if present at invocation, all occurrences of flag f (flag and argument, space separated)
 | %1, %2, ...|	the arguments themselves (after getopt(3) processing)
 
 With rpm >= 4.17 and disabled option processing the mentioned macros are defined as:

rpmio/macro.c

@@ -832,16 +832,24 @@ static void doDump(MacroBuf mb, rpmMacroEntry me, ARGV_t argv, size_t *parsed)
     rpmDumpMacroTable(mb->mc, NULL);
 }
 
+typedef struct {
+    MacroBuf mb;
+    char **argv;
+} MacroOptData;
 
 static int mbopt(int c, const char *oarg, int oint, void *data)
 {
-    MacroBuf mb = data;
-    char *name = NULL, *body = NULL;
+    MacroOptData *optData = (MacroOptData *)data;
+    MacroBuf mb = optData->mb;
+    char *name = NULL, *body = NULL, *fill = " ";
 
+    if (oint > 1 && optData->argv[oint-1] && optData->argv[oint-1][0] == '-') {
+        fill = "";
+    }
     /* Define option macros. */
     rasprintf(&name, "-%c", c);
     if (oarg) {
-	rasprintf(&body, "-%c %s", c, oarg);
+	rasprintf(&body, "-%c%s%s", c, fill, oarg);
     } else {
 	rasprintf(&body, "-%c", c);
     }
@@ -854,6 +862,21 @@ static int mbopt(int c, const char *oarg, int oint, void *data)
 	pushMacro(mb->mc, name, NULL, oarg, mb->level, ME_AUTO | ME_LITERAL);
 	free(name);
     }
+
+    rasprintf(&name, "-%c**", c);
+    rpmMacroEntry *mep = findEntry(mb->mc, name, 0, NULL);
+    if (mep && oarg)
+	rasprintf(&body, "%s -%c%s%s", (*mep)->body, c, fill, oarg);
+    else if (mep)
+	rasprintf(&body, "%s -%c", (*mep)->body, c);
+    else if (oarg)
+	rasprintf(&body, "-%c%s%s", c, fill, oarg);
+    else
+	rasprintf(&body, "-%c", c);
+    pushMacro(mb->mc, name, NULL, body, mb->level, ME_AUTO | ME_LITERAL);
+    free(name);
+    free(body);
+
     return 0;
 }
 
@@ -890,8 +913,9 @@ setupArgs(MacroBuf mb, const rpmMacroEntry me, ARGV_t argv)
     pushMacro(mb->mc, "**", NULL, args, mb->level, ME_AUTO | ME_LITERAL);
     free(args);
 
+    MacroOptData data = { mb, argv };
     argc = argvCount(argv);
-    ind = rgetopt(argc, argv, me->opts, mbopt, mb);
+    ind = rgetopt(argc, argv, me->opts, mbopt, &data);
 
     if (ind < 0) {
 	mbErr(mb, 1, _("Unknown option %c in %s(%s)\n"), -ind,

tests/rpmmacro.at

@@ -224,6 +224,36 @@ runroot rpm \
 ])
 RPMTEST_CLEANUP
 
+AT_SETUP([parametrized macro 8])
+AT_KEYWORDS([macros])
+AT_CHECK([
+runroot rpm \
+    --define '%foo(b:c) %{-b**}' \
+    --eval '%foo 5 a -b2 -bd=1 -c -b e=2'
+],
+[0],
+[-b2 -bd=1 -b e=2
+])
+AT_CLEANUP
+
+AT_SETUP([parametrized macro 9])
+AT_KEYWORDS([macros])
+AT_CHECK([
+runroot rpm \
+    --define '%foo(b:) %{-b}' \
+    --eval '%foo -bb' \
+    --eval '%foo -bb=1' \
+    --eval '%foo -b b' \
+    --eval '%foo -b b=1' \
+],
+[0],
+[-bb
+-bb=1
+-b b
+-b b=1
+])
+AT_CLEANUP
+
 AT_SETUP([uncompress macro 1])
 AT_KEYWORDS([macros])
 RPMTEST_CHECK([