Support passing extra options to dep generator scripts

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 68c328b..acdf943 100644 (file)
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -326,6 +326,7 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
 {
     const char * fn = fc->fn[fc->ix];
     char *buf = NULL;
+    char *mname = NULL;
     StringBuf sb_stdout = NULL;
     StringBuf sb_stdin;
     char *av[2];
@@ -347,7 +348,7 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
     case 'P':
        if (fc->skipProv)
            return 0;
-       rasprintf(&buf, "%%{?__%s_provides}", nsdep);
+       mname = rstrscat(NULL, "__", nsdep, "_provides", NULL);
        depsp = &fc->provides;
        dsContext = RPMSENSE_FIND_PROVIDES;
        tagN = RPMTAG_PROVIDENAME;
@@ -355,12 +356,13 @@ static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
     case 'R':
        if (fc->skipReq)
            return 0;
-       rasprintf(&buf, "%%{?__%s_requires}", nsdep);
+       mname = rstrscat(NULL, "__", nsdep, "_requires", NULL);
        depsp = &fc->requires;
        dsContext = RPMSENSE_FIND_REQUIRES;
        tagN = RPMTAG_REQUIRENAME;
        break;
     }
+    rasprintf(&buf, "%%{?%s:%%{%s} %%{?%s_opts}}", mname, mname, mname);
     av[0] = buf;
     av[1] = NULL;
 
@@ -428,6 +430,7 @@ assert(EVR != NULL);
     }
     sb_stdout = freeStringBuf(sb_stdout);
     free(buf);
+    free(mname);
 
     return 0;
 }

diff --git a/macros.in b/macros.in
index 6b64690..da39032 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -475,7 +475,10 @@ print (t)\
 #%__find_obsoletes     ???
 
 #
-# Path to scripts to autogenerate per-interpreter package dependencies,
+# Path to scripts to autogenerate per-interpreter package dependencies.
+# If the script supports extra options they can be passed by defining 
+# <helper_macro>_opts macro(s), eg in spec:
+# %define __ocaml_requires_opts -i Warnings
 #
 # Note: Used iff _use_internal_dependency_generator is non-zero. The
 # helpers are also used by %{_rpmconfigdir}/rpmdeps {--provides|--requires}.