diff options
| author | jbj <devnull@localhost> | 2004-09-30 21:45:27 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2004-09-30 21:45:27 +0000 |
| commit | 502f88e0e67bb1df91e09a32a370b04bda36259e (patch) | |
| tree | c432718e0ee6f1d9f6bca89775b9f7483f582e87 | |
| parent | 10336f101cd2798c8eb64335f8cc57baadea6454 (diff) | |
| download | rpm-502f88e0e67bb1df91e09a32a370b04bda36259e.tar.gz rpm-502f88e0e67bb1df91e09a32a370b04bda36259e.tar.bz2 rpm-502f88e0e67bb1df91e09a32a370b04bda36259e.zip | |
- prevent RPMSENSE_PREREQ from being set or tested.
CVS patchset: 7425
CVS date: 2004/09/30 21:45:27
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | lib/rpmlib.h | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -10,6 +10,7 @@ - add type to tag array. - add Disttag: syntax to spec file parser and header content. - define Suggests:/Enhances: and Priority: tag values. + - prevent RPMSENSE_PREREQ from being set or tested. 4.3.1 -> 4.3.2: - use /etc/selinux/targeted/contexts/files/file_contexts for now. diff --git a/lib/rpmlib.h b/lib/rpmlib.h index d82a62eab..8cbbce074 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -493,7 +493,8 @@ typedef enum rpmsenseFlags_e { RPMSENSE_EQUAL = (1 << 3), RPMSENSE_PROVIDES = (1 << 4), /* only used internally by builds */ RPMSENSE_CONFLICTS = (1 << 5), /* only used internally by builds */ - RPMSENSE_PREREQ = (1 << 6), /*!< @todo Legacy. */ + /* bit 6 used to be RPMSENSE_PREREQ */ +#define RPMSENSE_PREREQ RPMSENSE_ANY RPMSENSE_OBSOLETES = (1 << 7), /* only used internally by builds */ RPMSENSE_INTERP = (1 << 8), /*!< Interpreter used by scriptlet. */ RPMSENSE_SCRIPT_PRE = ((1 << 9)|RPMSENSE_PREREQ), /*!< %pre dependency. */ |