diff options
| author | SoonKyu Park <sk7.park@samsung.com> | 2017-02-28 10:13:18 +0900 |
|---|---|---|
| committer | SoonKyu Park <sk7.park@samsung.com> | 2017-02-28 10:13:31 +0900 |
| commit | be143a9a04b1558e402ea5d9d6bc41fdd5537bc5 (patch) | |
| tree | 3f5a0815d5d8b1727aa9989a37199cf8776b4131 | |
| parent | 687f1071d56dba1ba668437716d7033770fdf766 (diff) | |
| download | rpm-be143a9a04b1558e402ea5d9d6bc41fdd5537bc5.tar.gz rpm-be143a9a04b1558e402ea5d9d6bc41fdd5537bc5.tar.bz2 rpm-be143a9a04b1558e402ea5d9d6bc41fdd5537bc5.zip | |
Revert "Backporting weak dependencies"
This reverts commit 822fe26c20549c1e891d874316cf91a7b244c23d.
Change-Id: Ic866ff716b4d547b4499f701b7577d025b89e8db
| -rw-r--r-- | build/reqprov.c | 4 | ||||
| -rw-r--r-- | lib/rpmtag.h | 20 |
2 files changed, 4 insertions, 20 deletions
diff --git a/build/reqprov.c b/build/reqprov.c index cc642cae5..cbfbe56b5 100644 --- a/build/reqprov.c +++ b/build/reqprov.c @@ -89,21 +89,25 @@ int addReqProv(Header h, rpmTagVal tagN, versiontag = RPMTAG_RECOMMENDVERSION; flagtag = RPMTAG_RECOMMENDFLAGS; extra = Flags & _ALL_REQUIRES_MASK; + dsp = &pkg->recommends; break; case RPMTAG_SUGGESTNAME: versiontag = RPMTAG_SUGGESTVERSION; flagtag = RPMTAG_SUGGESTFLAGS; extra = Flags & _ALL_REQUIRES_MASK; + dsp = &pkg->suggests; break; case RPMTAG_SUPPLEMENTNAME: versiontag = RPMTAG_SUPPLEMENTVERSION; flagtag = RPMTAG_SUPPLEMENTFLAGS; extra = Flags & _ALL_REQUIRES_MASK; + dsp = &pkg->supplements; break; case RPMTAG_ENHANCENAME: versiontag = RPMTAG_ENHANCEVERSION; flagtag = RPMTAG_ENHANCEFLAGS; extra = Flags & _ALL_REQUIRES_MASK; + dsp = &pkg->enhances; break; case RPMTAG_REQUIRENAME: default: diff --git a/lib/rpmtag.h b/lib/rpmtag.h index 04d5a2c23..025a0a415 100644 --- a/lib/rpmtag.h +++ b/lib/rpmtag.h @@ -307,26 +307,6 @@ typedef enum rpmTag_e { RPMTAG_OBSOLETENEVRS = 5043, /* s[] extension */ RPMTAG_CONFLICTNEVRS = 5044, /* s[] extension */ RPMTAG_FILENLINKS = 5045, /* i[] extension */ - RPMTAG_RECOMMENDNAME = 5046, /* s[] */ -#define RPMTAG_RECOMMENDS RPMTAG_RECOMMENDNAME /* s[] */ - RPMTAG_RECOMMENDVERSION = 5047, /* s[] */ - RPMTAG_RECOMMENDFLAGS = 5048, /* i[] */ - RPMTAG_SUGGESTNAME = 5049, /* s[] */ -#define RPMTAG_SUGGESTS RPMTAG_SUGGESTNAME /* s[] */ - RPMTAG_SUGGESTVERSION = 5050, /* s[] extension */ - RPMTAG_SUGGESTFLAGS = 5051, /* i[] extension */ - RPMTAG_SUPPLEMENTNAME = 5052, /* s[] */ -#define RPMTAG_SUPPLEMENTS RPMTAG_SUPPLEMENTNAME /* s[] */ - RPMTAG_SUPPLEMENTVERSION = 5053, /* s[] */ - RPMTAG_SUPPLEMENTFLAGS = 5054, /* i[] */ - RPMTAG_ENHANCENAME = 5055, /* s[] */ -#define RPMTAG_ENHANCES RPMTAG_ENHANCENAME /* s[] */ - RPMTAG_ENHANCEVERSION = 5056, /* s[] */ - RPMTAG_ENHANCEFLAGS = 5057, /* i[] */ - RPMTAG_RECOMMENDNEVRS = 5058, /* s[] extension */ - RPMTAG_SUGGESTNEVRS = 5059, /* s[] extension */ - RPMTAG_SUPPLEMENTNEVRS = 5060, /* s[] extension */ - RPMTAG_ENHANCENEVRS = 5061, /* s[] extension */ RPMTAG_FIRSTFREE_TAG /*!< internal */ } rpmTag; |