depMsg doesn't need _notpre() anymore
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 1 Jun 2009 12:32:26 +0000 (15:32 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 21 Jul 2009 06:37:32 +0000 (09:37 +0300)
(cherry picked from commit 27d1f56f2945c59b39668685090977c6c2635431)

build/rpmfc.c

index 4a9afb8..bcb5383 100644 (file)
@@ -1349,25 +1349,25 @@ static struct DepMsg_s depMsgs[] = {
        0, -1 },
   { "Requires(interp)",        { NULL, "interp", NULL, NULL },
        RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_INTERP), 0 },
+       RPMSENSE_INTERP, 0 },
   { "Requires(rpmlib)",        { NULL, "rpmlib", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_RPMLIB), 0 },
+       RPMSENSE_RPMLIB, 0 },
   { "Requires(verify)",        { NULL, "verify", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
        RPMSENSE_SCRIPT_VERIFY, 0 },
   { "Requires(pre)",   { NULL, "pre", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_SCRIPT_PRE), 0 },
+       RPMSENSE_SCRIPT_PRE, 0 },
   { "Requires(post)",  { NULL, "post", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_SCRIPT_POST), 0 },
+       RPMSENSE_SCRIPT_POST, 0 },
   { "Requires(preun)", { NULL, "preun", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_SCRIPT_PREUN), 0 },
+       RPMSENSE_SCRIPT_PREUN, 0 },
   { "Requires(postun)",        { NULL, "postun", NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,
-       _notpre(RPMSENSE_SCRIPT_POSTUN), 0 },
+       RPMSENSE_SCRIPT_POSTUN, 0 },
   { "Requires",                { "%{?__find_requires}", NULL, NULL, NULL },
        -1, -1, RPMTAG_REQUIREFLAGS,    /* XXX inherit name/version arrays */
        RPMSENSE_FIND_REQUIRES|RPMSENSE_TRIGGERIN|RPMSENSE_TRIGGERUN|RPMSENSE_TRIGGERPOSTUN|RPMSENSE_TRIGGERPREIN, 0 },