Re-initialize dependency flags for each token.

CVS patchset: 3105
CVS date: 1999/06/19 18:09:49

diff --git a/build/parseReqs.c b/build/parseReqs.c
index b10ae01..32fe6d8 100644 (file)
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -33,52 +33,52 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index)
     const char *r, *re, *v, *ve;
     char *req, *version;
     Header h;
-    int flags;
+    int tagflags, flags;
 
     switch (tag) {
     case RPMTAG_PROVIDES:
-       flags = RPMSENSE_PROVIDES;
+       tagflags = RPMSENSE_PROVIDES;
        h = pkg->header;
        break;
     case RPMTAG_OBSOLETES:
-       flags = RPMSENSE_OBSOLETES;
+       tagflags = RPMSENSE_OBSOLETES;
        h = pkg->header;
        break;
     case RPMTAG_CONFLICTFLAGS:
-       flags = RPMSENSE_CONFLICTS;
+       tagflags = RPMSENSE_CONFLICTS;
        h = pkg->header;
        break;
     case RPMTAG_BUILDCONFLICTS:
-       flags = RPMSENSE_CONFLICTS;
+       tagflags = RPMSENSE_CONFLICTS;
        h = spec->buildRestrictions;
        break;
     case RPMTAG_PREREQ:
-       flags = RPMSENSE_PREREQ;
+       tagflags = RPMSENSE_PREREQ;
        h = pkg->header;
        break;
     case RPMTAG_BUILDPREREQ:
-       flags = RPMSENSE_PREREQ;
+       tagflags = RPMSENSE_PREREQ;
        h = spec->buildRestrictions;
        break;
     case RPMTAG_TRIGGERIN:
-       flags = RPMSENSE_TRIGGERIN;
+       tagflags = RPMSENSE_TRIGGERIN;
        h = pkg->header;
        break;
     case RPMTAG_TRIGGERPOSTUN:
-       flags = RPMSENSE_TRIGGERPOSTUN;
+       tagflags = RPMSENSE_TRIGGERPOSTUN;
        h = pkg->header;
        break;
     case RPMTAG_TRIGGERUN:
-       flags = RPMSENSE_TRIGGERUN;
+       tagflags = RPMSENSE_TRIGGERUN;
        h = pkg->header;
        break;
     case RPMTAG_BUILDREQUIRES:
-       flags = RPMSENSE_ANY;
+       tagflags = RPMSENSE_ANY;
        h = spec->buildRestrictions;
        break;
     default:
     case RPMTAG_REQUIREFLAGS:
-       flags = RPMSENSE_ANY;
+       tagflags = RPMSENSE_ANY;
        h = pkg->header;
        break;
     }
@@ -88,6 +88,8 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index)
        if (*r == '\0')
            break;
 
+       flags = tagflags;
+
        /* Tokens must begin with alphanumeric, _, or / */
        if (!(isalnum(r[0]) || r[0] == '_' || r[0] == '/')) {
            rpmError(RPMERR_BADSPEC,

diff --git a/po/rpm.pot b/po/rpm.pot
index 260f12b..30e507a 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-06-18 10:33-0400\n"
+"POT-Creation-Date: 1999-06-19 14:08-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2104,28 +2104,28 @@ msgstr ""
 msgid "line %d: second %%prep"
 msgstr ""
 
-#: ../build/parseReqs.c:94
+#: ../build/parseReqs.c:96
 #, c-format
 msgid ""
 "line %d: Dependency tokens must begin with alpha-numeric, '_' or '/': %s"
 msgstr ""
 
-#: ../build/parseReqs.c:105
+#: ../build/parseReqs.c:107
 #, c-format
 msgid "line %d: File name not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:137
+#: ../build/parseReqs.c:139
 #, c-format
 msgid "line %d: Versioned file name not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:148
+#: ../build/parseReqs.c:150
 #, c-format
 msgid "line %d: Version not permitted: %s"
 msgstr ""
 
-#: ../build/parseReqs.c:168
+#: ../build/parseReqs.c:170
 #, c-format
 msgid "line %d: Version required: %s"
 msgstr ""

diff --git a/rpm.spec b/rpm.spec
index 0c0f2d9..8a75338 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.0.2
 Version: %{version}
-Release: 0.4
+Release: 0.5
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL