diff options
| author | jbj <devnull@localhost> | 2000-11-12 11:11:49 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2000-11-12 11:11:49 +0000 |
| commit | 44e5913dae80f1040748441af35fb02b840c397a (patch) | |
| tree | addb267c910cd40c1788688abe83afe8409e9ca7 /build/reqprov.c | |
| parent | 97e479677f998ed02643804b37bf89e40a56a0cf (diff) | |
| download | librpm-tizen-44e5913dae80f1040748441af35fb02b840c397a.tar.gz librpm-tizen-44e5913dae80f1040748441af35fb02b840c397a.tar.bz2 librpm-tizen-44e5913dae80f1040748441af35fb02b840c397a.zip | |
- fine-grained Requires, remove install PreReq's from Requires db.
CVS patchset: 4258
CVS date: 2000/11/12 11:11:49
Diffstat (limited to 'build/reqprov.c')
| -rw-r--r-- | build/reqprov.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build/reqprov.c b/build/reqprov.c index 7a4ec38fa..f96158e7c 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -23,6 +23,7 @@ int addReqProv(/*@unused@*/ Spec spec, Header h, nametag = RPMTAG_PROVIDENAME; versiontag = RPMTAG_PROVIDEVERSION; flagtag = RPMTAG_PROVIDEFLAGS; + extra = flag & RPMSENSE_FIND_PROVIDES; } else if (flag & RPMSENSE_OBSOLETES) { nametag = RPMTAG_OBSOLETENAME; versiontag = RPMTAG_OBSOLETEVERSION; @@ -35,7 +36,7 @@ int addReqProv(/*@unused@*/ Spec spec, Header h, nametag = RPMTAG_REQUIRENAME; versiontag = RPMTAG_REQUIREVERSION; flagtag = RPMTAG_REQUIREFLAGS; - extra = RPMSENSE_PREREQ; + extra = flag & _ALL_REQUIRES_MASK; } else if (flag & RPMSENSE_TRIGGER) { nametag = RPMTAG_TRIGGERNAME; versiontag = RPMTAG_TRIGGERVERSION; @@ -46,6 +47,7 @@ int addReqProv(/*@unused@*/ Spec spec, Header h, nametag = RPMTAG_REQUIRENAME; versiontag = RPMTAG_REQUIREVERSION; flagtag = RPMTAG_REQUIREFLAGS; + extra = flag & _ALL_REQUIRES_MASK; } flag = (flag & (RPMSENSE_SENSEMASK | RPMSENSE_MULTILIB)) | extra; @@ -114,6 +116,6 @@ int rpmlibNeedsFeature(Header h, const char * feature, const char * featureEVR) (void) stpcpy( stpcpy( stpcpy(reqname, "rpmlib("), feature), ")"); /* XXX 1st arg is unused */ - return addReqProv(NULL, h, RPMSENSE_PREREQ|(RPMSENSE_LESS|RPMSENSE_EQUAL), + return addReqProv(NULL, h, RPMSENSE_RPMLIB|(RPMSENSE_LESS|RPMSENSE_EQUAL), reqname, featureEVR, 0); } |