diff options
| author | jbj <devnull@localhost> | 1999-07-22 17:48:31 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 1999-07-22 17:48:31 +0000 |
| commit | 0f7a33ebf8ea7128f5504e93e77f8aeaa43ab119 (patch) | |
| tree | 17783c57a5936232ad44ffd2c588b820fb0c42b2 /build | |
| parent | 1cbea413b4e90fe517fbb18f925fea9a13cc0c31 (diff) | |
| download | librpm-tizen-0f7a33ebf8ea7128f5504e93e77f8aeaa43ab119.tar.gz librpm-tizen-0f7a33ebf8ea7128f5504e93e77f8aeaa43ab119.tar.bz2 librpm-tizen-0f7a33ebf8ea7128f5504e93e77f8aeaa43ab119.zip | |
add versions to provides.
CVS patchset: 3196
CVS date: 1999/07/22 17:48:31
Diffstat (limited to 'build')
| -rw-r--r-- | build/parsePreamble.c | 4 | ||||
| -rw-r--r-- | build/parseReqs.c | 3 | ||||
| -rw-r--r-- | build/reqprov.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index fe00f303c..6e7841eb5 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -476,7 +476,7 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro, } break; case RPMTAG_OBSOLETES: - case RPMTAG_PROVIDES: + case RPMTAG_PROVIDEFLAGS: case RPMTAG_BUILDREQUIRES: case RPMTAG_BUILDCONFLICTS: case RPMTAG_BUILDPREREQ: @@ -554,7 +554,7 @@ static struct PreambleRec { /* {RPMTAG_EXCLUDE, 0, 0, "exclude"}, */ /* {RPMTAG_EXCLUSIVE, 0, 0, "exclusive"}, */ {RPMTAG_ICON, 0, 0, "icon"}, - {RPMTAG_PROVIDES, 0, 0, "provides"}, + {RPMTAG_PROVIDEFLAGS, 0, 0, "provides"}, {RPMTAG_REQUIREFLAGS, 0, 0, "requires"}, {RPMTAG_PREREQ, 0, 0, "prereq"}, {RPMTAG_CONFLICTFLAGS, 0, 0, "conflicts"}, diff --git a/build/parseReqs.c b/build/parseReqs.c index f2a753ef8..89c78d150 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -42,7 +42,7 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index) int tagflags, flags; switch (tag) { - case RPMTAG_PROVIDES: + case RPMTAG_PROVIDEFLAGS: tagflags = RPMSENSE_PROVIDES; h = pkg->header; break; @@ -148,7 +148,6 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, int index) } switch(tag) { - case RPMTAG_PROVIDES: case RPMTAG_OBSOLETES: case RPMTAG_BUILDPREREQ: case RPMTAG_PREREQ: diff --git a/build/reqprov.c b/build/reqprov.c index 53d6f8dcf..1a79b5b98 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -19,7 +19,9 @@ int addReqProv(Spec spec, Header h, int extra = 0; if (flag & RPMSENSE_PROVIDES) { - nametag = RPMTAG_PROVIDES; + nametag = RPMTAG_PROVIDENAME; + versiontag = RPMTAG_PROVIDEVERSION; + flagtag = RPMTAG_PROVIDEFLAGS; } else if (flag & RPMSENSE_OBSOLETES) { nametag = RPMTAG_OBSOLETES; } else if (flag & RPMSENSE_CONFLICTS) { |