|
 |
5523e9 |
diff -up rpm-4.11.3/build/pack.c.weakdep-tags rpm-4.11.3/build/pack.c
|
|
|
5523e9 |
--- rpm-4.11.3/build/pack.c.weakdep-tags 2017-11-13 16:46:28.552714717 +0200
|
|
|
5523e9 |
+++ rpm-4.11.3/build/pack.c 2017-11-13 16:47:44.942681784 +0200
|
|
|
5523e9 |
@@ -228,8 +228,6 @@ static rpmTagVal depevrtags[] = {
|
|
|
5523e9 |
RPMTAG_CONFLICTVERSION,
|
|
|
5523e9 |
RPMTAG_ORDERVERSION,
|
|
|
5523e9 |
RPMTAG_TRIGGERVERSION,
|
|
|
5523e9 |
- RPMTAG_SUGGESTSVERSION,
|
|
|
5523e9 |
- RPMTAG_ENHANCESVERSION,
|
|
|
5523e9 |
0
|
|
|
5523e9 |
};
|
|
|
5523e9 |
|
|
|
5523e9 |
diff -up rpm-4.11.3/lib/rpmtag.h.weakdep-tags rpm-4.11.3/lib/rpmtag.h
|
|
|
5523e9 |
--- rpm-4.11.3/lib/rpmtag.h.weakdep-tags 2017-11-02 12:21:38.248264213 +0200
|
|
|
5523e9 |
+++ rpm-4.11.3/lib/rpmtag.h 2017-11-02 12:24:16.159193622 +0200
|
|
|
5523e9 |
@@ -217,14 +217,14 @@ typedef enum rpmTag_e {
|
|
|
5523e9 |
RPMTAG_PRETRANSPROG = 1153, /* s[] */
|
|
|
5523e9 |
RPMTAG_POSTTRANSPROG = 1154, /* s[] */
|
|
|
5523e9 |
RPMTAG_DISTTAG = 1155, /* s */
|
|
|
5523e9 |
- RPMTAG_SUGGESTSNAME = 1156, /* s[] extension (unimplemented) */
|
|
|
5523e9 |
-#define RPMTAG_SUGGESTS RPMTAG_SUGGESTSNAME /* s[] (unimplemented) */
|
|
|
5523e9 |
- RPMTAG_SUGGESTSVERSION = 1157, /* s[] extension (unimplemented) */
|
|
|
5523e9 |
- RPMTAG_SUGGESTSFLAGS = 1158, /* i[] extension (unimplemented) */
|
|
|
5523e9 |
- RPMTAG_ENHANCESNAME = 1159, /* s[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
-#define RPMTAG_ENHANCES RPMTAG_ENHANCESNAME /* s[] (unimplemented) */
|
|
|
5523e9 |
- RPMTAG_ENHANCESVERSION = 1160, /* s[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
- RPMTAG_ENHANCESFLAGS = 1161, /* i[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDSUGGESTSNAME = 1156, /* s[] extension (unimplemented) */
|
|
|
5523e9 |
+#define RPMTAG_OLDSUGGESTS RPMTAG_OLDSUGGESTSNAME /* s[] (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDSUGGESTSVERSION = 1157, /* s[] extension (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDSUGGESTSFLAGS = 1158, /* i[] extension (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDENHANCESNAME = 1159, /* s[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
+#define RPMTAG_OLDENHANCES RPMTAG_OLDENHANCESNAME /* s[] (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDENHANCESVERSION = 1160, /* s[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
+ RPMTAG_OLDENHANCESFLAGS = 1161, /* i[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
RPMTAG_PRIORITY = 1162, /* i[] extension placeholder (unimplemented) */
|
|
|
5523e9 |
RPMTAG_CVSID = 1163, /* s (unimplemented) */
|
|
|
5523e9 |
#define RPMTAG_SVNID RPMTAG_CVSID /* s (unimplemented) */
|
|
|
5523e9 |
@@ -307,6 +307,22 @@ typedef enum rpmTag_e {
|
|
|
5523e9 |
RPMTAG_OBSOLETENEVRS = 5043, /* s[] extension */
|
|
|
5523e9 |
RPMTAG_CONFLICTNEVRS = 5044, /* s[] extension */
|
|
|
5523e9 |
RPMTAG_FILENLINKS = 5045, /* i[] extension */
|
|
|
5523e9 |
+ RPMTAG_RECOMMENDNAME = 5046, /* s[] */
|
|
|
5523e9 |
+#define RPMTAG_RECOMMENDS RPMTAG_RECOMMENDNAME /* s[] */
|
|
|
5523e9 |
+ RPMTAG_RECOMMENDVERSION = 5047, /* s[] */
|
|
|
5523e9 |
+ RPMTAG_RECOMMENDFLAGS = 5048, /* i[] */
|
|
|
5523e9 |
+ RPMTAG_SUGGESTNAME = 5049, /* s[] */
|
|
|
5523e9 |
+#define RPMTAG_SUGGESTS RPMTAG_SUGGESTNAME /* s[] */
|
|
|
5523e9 |
+ RPMTAG_SUGGESTVERSION = 5050, /* s[] extension */
|
|
|
5523e9 |
+ RPMTAG_SUGGESTFLAGS = 5051, /* i[] extension */
|
|
|
5523e9 |
+ RPMTAG_SUPPLEMENTNAME = 5052, /* s[] */
|
|
|
5523e9 |
+#define RPMTAG_SUPPLEMENTS RPMTAG_SUPPLEMENTNAME /* s[] */
|
|
|
5523e9 |
+ RPMTAG_SUPPLEMENTVERSION = 5053, /* s[] */
|
|
|
5523e9 |
+ RPMTAG_SUPPLEMENTFLAGS = 5054, /* i[] */
|
|
|
5523e9 |
+ RPMTAG_ENHANCENAME = 5055, /* s[] */
|
|
|
5523e9 |
+#define RPMTAG_ENHANCES RPMTAG_ENHANCENAME /* s[] */
|
|
|
5523e9 |
+ RPMTAG_ENHANCEVERSION = 5056, /* s[] */
|
|
|
5523e9 |
+ RPMTAG_ENHANCEFLAGS = 5057, /* i[] */
|
|
|
5523e9 |
|
|
|
5523e9 |
RPMTAG_FIRSTFREE_TAG /*!< internal */
|
|
|
5523e9 |
} rpmTag;
|
|
|
5523e9 |
diff -up rpm-4.11.3/tests/rpmgeneral.at.weakdep-tags rpm-4.11.3/tests/rpmgeneral.at
|
|
|
5523e9 |
--- rpm-4.11.3/tests/rpmgeneral.at.weakdep-tags 2012-11-07 14:55:24.000000000 +0200
|
|
|
5523e9 |
+++ rpm-4.11.3/tests/rpmgeneral.at 2017-11-02 12:21:38.248264213 +0200
|
|
|
5523e9 |
@@ -79,6 +79,10 @@ DISTTAG
|
|
|
5523e9 |
DISTURL
|
|
|
5523e9 |
DSAHEADER
|
|
|
5523e9 |
E
|
|
|
5523e9 |
+ENHANCEFLAGS
|
|
|
5523e9 |
+ENHANCENAME
|
|
|
5523e9 |
+ENHANCES
|
|
|
5523e9 |
+ENHANCEVERSION
|
|
|
5523e9 |
EPOCH
|
|
|
5523e9 |
EPOCHNUM
|
|
|
5523e9 |
EVR
|
|
|
5523e9 |
@@ -199,6 +203,10 @@ PROVIDES
|
|
|
5523e9 |
PROVIDEVERSION
|
|
|
5523e9 |
PUBKEYS
|
|
|
5523e9 |
R
|
|
|
5523e9 |
+RECOMMENDFLAGS
|
|
|
5523e9 |
+RECOMMENDNAME
|
|
|
5523e9 |
+RECOMMENDS
|
|
|
5523e9 |
+RECOMMENDVERSION
|
|
|
5523e9 |
RECONTEXTS
|
|
|
5523e9 |
RELEASE
|
|
|
5523e9 |
REMOVETID
|
|
|
5523e9 |
@@ -219,7 +227,15 @@ SOURCE
|
|
|
5523e9 |
SOURCEPACKAGE
|
|
|
5523e9 |
SOURCEPKGID
|
|
|
5523e9 |
SOURCERPM
|
|
|
5523e9 |
+SUGGESTFLAGS
|
|
|
5523e9 |
+SUGGESTNAME
|
|
|
5523e9 |
+SUGGESTS
|
|
|
5523e9 |
+SUGGESTVERSION
|
|
|
5523e9 |
SUMMARY
|
|
|
5523e9 |
+SUPPLEMENTFLAGS
|
|
|
5523e9 |
+SUPPLEMENTNAME
|
|
|
5523e9 |
+SUPPLEMENTS
|
|
|
5523e9 |
+SUPPLEMENTVERSION
|
|
|
5523e9 |
TRIGGERCONDS
|
|
|
5523e9 |
TRIGGERFLAGS
|
|
|
5523e9 |
TRIGGERINDEX
|