rpmds.h   rpmds.h 
skipping to change at line 36 skipping to change at line 36
/** \ingroup rpmds /** \ingroup rpmds
* Dependency Attributes. * Dependency Attributes.
*/ */
typedef enum rpmsenseFlags_e { typedef enum rpmsenseFlags_e {
RPMSENSE_ANY = 0, RPMSENSE_ANY = 0,
RPMSENSE_LESS = (1 << 1), RPMSENSE_LESS = (1 << 1),
RPMSENSE_GREATER = (1 << 2), RPMSENSE_GREATER = (1 << 2),
RPMSENSE_EQUAL = (1 << 3), RPMSENSE_EQUAL = (1 << 3),
RPMSENSE_PROVIDES = (1 << 4), /* only used internally by builds */ RPMSENSE_PROVIDES = (1 << 4), /* only used internally by builds */
RPMSENSE_CONFLICTS = (1 << 5), /* only used internally by builds */ RPMSENSE_CONFLICTS = (1 << 5), /* only used internally by builds */
/* bit 6 used to be RPMSENSE_PREREQ */ RPMSENSE_PREREQ = (1 << 6), /* legacy prereq dependency */
#define RPMSENSE_PREREQ RPMSENSE_ANY
RPMSENSE_OBSOLETES = (1 << 7), /* only used internally by builds */ RPMSENSE_OBSOLETES = (1 << 7), /* only used internally by builds */
RPMSENSE_INTERP = (1 << 8), /*!< Interpreter used by scriptlet. */ RPMSENSE_INTERP = (1 << 8), /*!< Interpreter used by scriptlet. */
RPMSENSE_SCRIPT_PRE = ((1 << 9)|RPMSENSE_PREREQ), /*!< %pre depe RPMSENSE_SCRIPT_PRE = (1 << 9), /*!< %pre dependency. */
ndency. */ RPMSENSE_SCRIPT_POST = (1 << 10), /*!< %post dependency. */
RPMSENSE_SCRIPT_POST = ((1 << 10)|RPMSENSE_PREREQ), /*!< %post dependen RPMSENSE_SCRIPT_PREUN = (1 << 11), /*!< %preun dependency. */
cy. */ RPMSENSE_SCRIPT_POSTUN = (1 << 12), /*!< %postun dependency. */
RPMSENSE_SCRIPT_PREUN = ((1 << 11)|RPMSENSE_PREREQ), /*!< %preun depend
ency. */
RPMSENSE_SCRIPT_POSTUN = ((1 << 12)|RPMSENSE_PREREQ), /*!< %postun depe
ndency. */
RPMSENSE_SCRIPT_VERIFY = (1 << 13), /*!< %verify dependency. */ RPMSENSE_SCRIPT_VERIFY = (1 << 13), /*!< %verify dependency. */
RPMSENSE_FIND_REQUIRES = (1 << 14), /*!< find-requires generated depend ency. */ RPMSENSE_FIND_REQUIRES = (1 << 14), /*!< find-requires generated depend ency. */
RPMSENSE_FIND_PROVIDES = (1 << 15), /*!< find-provides generated depend ency. */ RPMSENSE_FIND_PROVIDES = (1 << 15), /*!< find-provides generated depend ency. */
RPMSENSE_TRIGGERIN = (1 << 16), /*!< %triggerin dependency. */ RPMSENSE_TRIGGERIN = (1 << 16), /*!< %triggerin dependency. */
RPMSENSE_TRIGGERUN = (1 << 17), /*!< %triggerun dependency. */ RPMSENSE_TRIGGERUN = (1 << 17), /*!< %triggerun dependency. */
RPMSENSE_TRIGGERPOSTUN = (1 << 18), /*!< %triggerpostun dependen cy. */ RPMSENSE_TRIGGERPOSTUN = (1 << 18), /*!< %triggerpostun dependen cy. */
RPMSENSE_MISSINGOK = (1 << 19), /*!< suggests/enhances hint. */ RPMSENSE_MISSINGOK = (1 << 19), /*!< suggests/enhances hint. */
RPMSENSE_SCRIPT_PREP = (1 << 20), /*!< %prep build dependency. */ RPMSENSE_SCRIPT_PREP = (1 << 20), /*!< %prep build dependency. */
RPMSENSE_SCRIPT_BUILD = (1 << 21), /*!< %build build dependency. */ RPMSENSE_SCRIPT_BUILD = (1 << 21), /*!< %build build dependency. */
RPMSENSE_SCRIPT_INSTALL = (1 << 22),/*!< %install build dependency. */ RPMSENSE_SCRIPT_INSTALL = (1 << 22),/*!< %install build dependency. */
RPMSENSE_SCRIPT_CLEAN = (1 << 23), /*!< %clean build dependency. */ RPMSENSE_SCRIPT_CLEAN = (1 << 23), /*!< %clean build dependency. */
RPMSENSE_RPMLIB = ((1 << 24) | RPMSENSE_PREREQ), /*!< rpmlib(feature) d ependency. */ RPMSENSE_RPMLIB = (1 << 24), /*!< rpmlib(feature) dependency. */
RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */ RPMSENSE_TRIGGERPREIN = (1 << 25), /*!< %triggerprein dependency. */
RPMSENSE_KEYRING = (1 << 26), RPMSENSE_KEYRING = (1 << 26),
RPMSENSE_PATCHES = (1 << 27), RPMSENSE_PATCHES = (1 << 27),
RPMSENSE_CONFIG = (1 << 28) RPMSENSE_CONFIG = (1 << 28)
} rpmsenseFlags; } rpmsenseFlags;
#define RPMSENSE_SENSEMASK 15 /* Mask to get senses, ie s erial, */ #define RPMSENSE_SENSEMASK 15 /* Mask to get senses, ie s erial, */
/* less, greater, equal. */ /* less, greater, equal. */
#define RPMSENSE_TRIGGER \ #define RPMSENSE_TRIGGER \
skipping to change at line 82 skipping to change at line 81
RPMSENSE_SCRIPT_POST | \ RPMSENSE_SCRIPT_POST | \
RPMSENSE_SCRIPT_PREUN | \ RPMSENSE_SCRIPT_PREUN | \
RPMSENSE_SCRIPT_POSTUN | \ RPMSENSE_SCRIPT_POSTUN | \
RPMSENSE_SCRIPT_VERIFY | \ RPMSENSE_SCRIPT_VERIFY | \
RPMSENSE_FIND_REQUIRES | \ RPMSENSE_FIND_REQUIRES | \
RPMSENSE_SCRIPT_PREP | \ RPMSENSE_SCRIPT_PREP | \
RPMSENSE_SCRIPT_BUILD | \ RPMSENSE_SCRIPT_BUILD | \
RPMSENSE_SCRIPT_INSTALL | \ RPMSENSE_SCRIPT_INSTALL | \
RPMSENSE_SCRIPT_CLEAN | \ RPMSENSE_SCRIPT_CLEAN | \
RPMSENSE_RPMLIB | \ RPMSENSE_RPMLIB | \
RPMSENSE_KEYRING ) RPMSENSE_KEYRING | \
RPMSENSE_PREREQ)
#define _notpre(_x) ((_x) & ~RPMSENSE_PREREQ) #define _notpre(_x) ((_x) & ~RPMSENSE_PREREQ)
#define _INSTALL_ONLY_MASK \ #define _INSTALL_ONLY_MASK \
_notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSEN SE_KEYRING) _notpre(RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POST|RPMSENSE_RPMLIB|RPMSEN SE_KEYRING)
#define _ERASE_ONLY_MASK \ #define _ERASE_ONLY_MASK \
_notpre(RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_POSTUN) _notpre(RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_POSTUN)
#define isLegacyPreReq(_x) (((_x) & _ALL_REQUIRES_MASK) == RPMSENSE _PREREQ) #define isLegacyPreReq(_x) (((_x) & _ALL_REQUIRES_MASK) == RPMSENSE _PREREQ)
#define isInstallPreReq(_x) ((_x) & _INSTALL_ONLY_MASK) #define isInstallPreReq(_x) ((_x) & _INSTALL_ONLY_MASK)
#define isErasePreReq(_x) ((_x) & _ERASE_ONLY_MASK) #define isErasePreReq(_x) ((_x) & _ERASE_ONLY_MASK)
 End of changes. 4 change blocks. 
12 lines changed or deleted 8 lines changed or added


 rpmspec.h   rpmspec.h 
skipping to change at line 172 skipping to change at line 172
char * postUnFile; /*!< %postun scriptlet. */ char * postUnFile; /*!< %postun scriptlet. */
char * preTransFile; /*!< %pretrans scriptlet. */ char * preTransFile; /*!< %pretrans scriptlet. */
char * postTransFile; /*!< %posttrans scriptlet. */ char * postTransFile; /*!< %posttrans scriptlet. */
char * verifyFile; /*!< %verifyscript scriptlet. */ char * verifyFile; /*!< %verifyscript scriptlet. */
StringBuf specialDoc; StringBuf specialDoc;
char *specialDocDir; char *specialDocDir;
struct TriggerFileEntry * triggerFiles; struct TriggerFileEntry * triggerFiles;
char * fileFile; StringBuf fileFile;
StringBuf fileList; /* If NULL, package will not be writ ten */ StringBuf fileList; /* If NULL, package will not be writ ten */
Package next; Package next;
}; };
/** \ingroup rpmbuild /** \ingroup rpmbuild
* Create and initialize rpmSpec structure. * Create and initialize rpmSpec structure.
* @return spec spec file control structure * @return spec spec file control structure
*/ */
rpmSpec newSpec(void); rpmSpec newSpec(void);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/