folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add RPMTAG_RECOMMENDNEVRS, RPMTAG_SUGGESTNEVRS, RPMTAG_SUPPLEMENTNEVRS and RPMTAG_ENHANCENEVRS extension tags

This commit is contained in:
Florian Festi 2014-02-17 09:21:21 +01:00
parent 87fccc631b
commit 4360e7e131
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rpmtag.h
View File

@ -324,6 +324,10 @@ typedef enum rpmTag_e {
#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;

24
lib/tagexts.c
View File

@ -761,6 +761,26 @@ static int requirenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
return depnevrsTag(h, td, hgflags, RPMTAG_REQUIRENAME);
}
static int recommendnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
{
return depnevrsTag(h, td, hgflags, RPMTAG_RECOMMENDNAME);
}
static int suggestnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
{
return depnevrsTag(h, td, hgflags, RPMTAG_SUGGESTNAME);
}
static int supplementnevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
{
return depnevrsTag(h, td, hgflags, RPMTAG_SUPPLEMENTNAME);
}
static int enhancenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
{
return depnevrsTag(h, td, hgflags, RPMTAG_ENHANCENAME);
}
static int providenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)
{
return depnevrsTag(h, td, hgflags, RPMTAG_PROVIDENAME);
@ -823,6 +843,10 @@ static const struct headerTagFunc_s rpmHeaderTagExtensions[] = {
{ RPMTAG_EPOCHNUM, epochnumTag },
{ RPMTAG_INSTFILENAMES, instfilenamesTag },
{ RPMTAG_REQUIRENEVRS, requirenevrsTag },
{ RPMTAG_RECOMMENDNEVRS, recommendnevrsTag},
{ RPMTAG_SUGGESTNEVRS, suggestnevrsTag},
{ RPMTAG_SUPPLEMENTNEVRS, supplementnevrsTag},
{ RPMTAG_ENHANCENEVRS, enhancenevrsTag},
{ RPMTAG_PROVIDENEVRS, providenevrsTag },
{ RPMTAG_OBSOLETENEVRS, obsoletenevrsTag },
{ RPMTAG_CONFLICTNEVRS, conflictnevrsTag },

4
tests/rpmgeneral.at
View File

@ -81,6 +81,7 @@ DSAHEADER
E
ENHANCEFLAGS
ENHANCENAME
ENHANCENEVRS
ENHANCES
ENHANCEVERSION
EPOCH
@ -205,6 +206,7 @@ PUBKEYS
R
RECOMMENDFLAGS
RECOMMENDNAME
RECOMMENDNEVRS
RECOMMENDS
RECOMMENDVERSION
RECONTEXTS
@ -229,11 +231,13 @@ SOURCEPKGID
SOURCERPM
SUGGESTFLAGS
SUGGESTNAME
SUGGESTNEVRS
SUGGESTS
SUGGESTVERSION
SUMMARY
SUPPLEMENTFLAGS
SUPPLEMENTNAME
SUPPLEMENTNEVRS
SUPPLEMENTS
SUPPLEMENTVERSION
TRIGGERCONDS