[CVS] RPM: syck/lib/ token.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: syck Date: 03-Apr-2009 13:16:57
Branch: HEAD Handle: 2009040311165700
Modified files:
syck/libtoken.c
Log:
use the YYSTYPE typedef, actual union is unnamed
Summary:
RevisionChanges Path
1.7 +1 -1 syck/lib/token.c
patch -p0 '@@ .'
Index: syck/lib/token.c
$ cvs diff -u -r1.6 -r1.7 token.c
--- syck/lib/token.c 2 Apr 2009 13:23:49 - 1.6
+++ syck/lib/token.c 3 Apr 2009 11:16:57 - 1.7
@@ -263,7 +263,7 @@
int
sycklex( void * _sycklval, SyckParser *parser )
{
-union YYSTYPE *sycklval = _sycklval;
+YYSTYPE *sycklval = _sycklval;
switch ( parser-input_type )
{
case syck_yaml_utf8:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Apr-2009 13:41:20 Branch: HEAD Handle: 2009040311412000 Modified files: rpm devtool.conf Log: uniform whitespace Summary: RevisionChanges Path 2.272 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.271 -r2.272 devtool.conf --- rpm/devtool.conf 1 Apr 2009 19:52:34 - 2.271 +++ rpm/devtool.conf 3 Apr 2009 11:41:20 - 2.272 @@ -77,7 +77,7 @@ --with-file=internal \ --with-lua=internal \ --with-sqlite=external \ - --with-syck=internal \ +--with-syck=internal \ --with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/build/ expression.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-Apr-2009 21:16:38
Branch: rpm-5_1 Handle: 2009040319163700
Modified files: (Branch: rpm-5_1)
rpm/build expression.c
Log:
- jbj: rework the whitespace, eliminate the clashing program styles.
Summary:
RevisionChanges Path
2.32.4.1+518 -514 rpm/build/expression.c
patch -p0 '@@ .'
Index: rpm/build/expression.c
$ cvs diff -u -r2.32 -r2.32.4.1 expression.c
--- rpm/build/expression.c16 Dec 2007 23:46:34 - 2.32
+++ rpm/build/expression.c3 Apr 2009 19:16:37 - 2.32.4.1
@@ -14,8 +14,10 @@
#include system.h
#include rpmio.h
+#include rpmiotypes.h
+#include rpmlog.h
+
#include rpmbuild.h
-#include rpmlib.h
#include debug.h
@@ -32,11 +34,11 @@
* Encapsulation of a value
*/
typedef struct _value {
- enum { VALUE_TYPE_INTEGER, VALUE_TYPE_STRING } type;
- union {
-const char *s;
-int i;
- } data;
+enum { VALUE_TYPE_INTEGER, VALUE_TYPE_STRING } type;
+union {
+ const char *s;
+ int i;
+} data;
} *Value;
/**
@@ -44,12 +46,12 @@
static Value valueMakeInteger(int i)
/*...@*/
{
- Value v;
+Value v;
- v = (Value) xmalloc(sizeof(*v));
- v-type = VALUE_TYPE_INTEGER;
- v-data.i = i;
- return v;
+v = (Value) xmalloc(sizeof(*v));
+v-type = VALUE_TYPE_INTEGER;
+v-data.i = i;
+return v;
}
/**
@@ -57,12 +59,12 @@
static Value valueMakeString(/*...@only@*/ const char *s)
/*...@*/
{
- Value v;
+Value v;
- v = (Value) xmalloc(sizeof(*v));
- v-type = VALUE_TYPE_STRING;
- v-data.s = s;
- return v;
+v = (Value) xmalloc(sizeof(*v));
+v-type = VALUE_TYPE_STRING;
+v-data.s = s;
+return v;
}
/**
@@ -70,26 +72,26 @@
static void valueFree( /*...@only@*/ Value v)
/*...@modifies v @*/
{
- if (v) {
-if (v-type == VALUE_TYPE_STRING)
- v-data.s = _free(v-data.s);
-v = _free(v);
- }
+if (v) {
+ if (v-type == VALUE_TYPE_STRING)
+ v-data.s = _free(v-data.s);
+ v = _free(v);
+}
}
#ifdef DEBUG_PARSER
static void valueDump(const char *msg, Value v, FILE *fp)
/*...@*/
{
- if (msg)
-fprintf(fp, %s , msg);
- if (v) {
-if (v-type == VALUE_TYPE_INTEGER)
- fprintf(fp, INTEGER %d\n, v-data.i);
-else
- fprintf(fp, STRING '%s'\n, v-data.s);
- } else
-fprintf(fp, NULL\n);
+if (msg)
+ fprintf(fp, %s , msg);
+if (v) {
+ if (v-type == VALUE_TYPE_INTEGER)
+ fprintf(fp, INTEGER %d\n, v-data.i);
+ else
+ fprintf(fp, STRING '%s'\n, v-data.s);
+} else
+ fprintf(fp, NULL\n);
}
#endif
@@ -186,228 +188,228 @@
* @param state expression parser state
*/
static int rdToken(ParseState state)
- /*...@globals rpmGlobalMacroContext, h_errno @*/
+ /*...@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*...@modifies state-nextToken, state-p, state-tokenValue,
- rpmGlobalMacroContext @*/
+ rpmGlobalMacroContext, internalState @*/
{
- int token;
- Value v = NULL;
- char *p = state-p;
-
- /* Skip whitespace before the next token. */
- while (*p xisspace(*p)) p++;
-
- switch (*p) {
- case '\0':
-token = TOK_EOF;
-p--;
-break;
- case '+':
-token = TOK_ADD;
-break;
- case '-':
-token = TOK_MINUS;
-break;
- case '*':
-token = TOK_MULTIPLY;
-break;
- case '/':
-token = TOK_DIVIDE;
-break;
- case '(':
-token = TOK_OPEN_P;
-break;
- case ')':
-token = TOK_CLOSE_P;
-break;
- case '=':
-if (p[1] == '=') {
- token = TOK_EQ;
- p++;
-} else {
- rpmlog(RPMLOG_ERR, _(syntax error while parsing ==\n));
- return -1;
-}
-break;
- case '!':
-if (p[1] == '=') {
- token = TOK_NEQ;
- p++;
-} else
- token = TOK_NOT;
-break;
- case '':
-if (p[1] == '=') {
- token = TOK_LE;
- p++;
-} else
- token = TOK_LT;
-break;
- case '':
-if (p[1] == '=') {
- token = TOK_GE;
- p++;
-} else
- token = TOK_GT;
-break;
- case '':
-if (p[1] == '') {
- token =
[CVS] RPM: rpm-5_1: rpm/build/ pack.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-Apr-2009 21:25:37
Branch: rpm-5_1 Handle: 2009040319253600
Modified files: (Branch: rpm-5_1)
rpm/build pack.c
Log:
- jbj: rewrite w correct data types to get rid of pugly casts.
Summary:
RevisionChanges Path
2.291.2.5 +6 -5 rpm/build/pack.c
patch -p0 '@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.291.2.4 -r2.291.2.5 pack.c
--- rpm/build/pack.c 29 Mar 2009 02:24:21 - 2.291.2.4
+++ rpm/build/pack.c 3 Apr 2009 19:25:36 - 2.291.2.5
@@ -587,6 +587,8 @@
int addsig = 0;
int isSource;
rpmRC rc = RPMRC_OK;
+size_t nbr;
+size_t nbw;
int xx;
/* Transfer header reference form *hdrp to h. */
@@ -880,16 +882,15 @@
}
/* Write the payload into the package. */
-while ((xx = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) 0) {
- if (xx = -1 || Ferror(ifd)) {
+while ((nbr = Fread(buf, sizeof(buf[0]), sizeof(buf), ifd)) 0) {
+ if (Ferror(ifd)) {
rpmlog(RPMLOG_ERR, _(Unable to read payload from %s: %s\n),
sigtarget, Fstrerror(ifd));
rc = RPMRC_FAIL;
goto exit;
}
- count = (uint32_t) xx;
- xx = Fwrite(buf, sizeof(buf[0]), count, fd);
- if ((uint32_t)xx != count || Ferror(fd)) {
+ nbw = Fwrite(buf, sizeof(buf[0]), nbr, fd);
+ if (nbr != nbw || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _(Unable to write payload to %s: %s\n),
fileName, Fstrerror(fd));
rc = RPMRC_FAIL;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES VENDOR
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 03-Apr-2009 22:04:51 Branch: rpm-5_1 Handle: 2009040320045000 Modified files: (Branch: rpm-5_1) rpm CHANGES VENDOR Log: - PLD: rpm-epoch0: Always add Epoch: 0 to packages. Summary: RevisionChanges Path 1.2288.2.270+1 -0 rpm/CHANGES 2.47.2.7+12 -0 rpm/VENDOR patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.269 -r1.2288.2.270 CHANGES --- rpm/CHANGES 2 Apr 2009 20:43:57 - 1.2288.2.269 +++ rpm/CHANGES 3 Apr 2009 20:04:50 - 1.2288.2.270 @@ -1,5 +1,6 @@ 5.1.7 - 5.1.8: - jbj: eliminate rpmal debugging code. +- jbj: PLD: rpm-epoch0: Always add Epoch: 0 to packages. - jbj: handle config(N) = E:V-R within rpmns.c (but treat as a string). - jbj: yaml: backport the YAML analogue tag extensions to repo-md XML. - jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc fiddle-ups. @@ . patch -p0 '@@ .' Index: rpm/VENDOR $ cvs diff -u -r2.47.2.6 -r2.47.2.7 VENDOR --- rpm/VENDOR11 Jan 2009 03:09:06 - 2.47.2.6 +++ rpm/VENDOR3 Apr 2009 20:04:50 - 2.47.2.7 @@ -509,3 +509,15 @@ Reason: Allow additional architectures to be added via a _known_arch list. This is useful to allow for new variants w/o having to modify RPM each time. + + + o Name: PLD + Vendor: PLD http://pld-linux.org/ + Representative: Jeff Johnson j...@rpm5.org + Application:PLD Linux + Characteristic: productive anarchy + + + Change: rpm-epoch0 + Purpose:Explictly add Epoch: 0 in all packages. + Reason: Avoids compatibility issues with ancient versions of RPM @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/build/ parsePreamble.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2009 02:26:09
Branch: rpm-5_1 Handle: 2009040400260800
Modified files: (Branch: rpm-5_1)
rpm/build parsePreamble.c
Log:
- jbj: oops, - PLD: rpm-epoch0: Always add Epoch: 0 to packages.
Summary:
RevisionChanges Path
2.171.2.6 +18 -0 rpm/build/parsePreamble.c
patch -p0 '@@ .'
Index: rpm/build/parsePreamble.c
$ cvs diff -u -r2.171.2.5 -r2.171.2.6 parsePreamble.c
--- rpm/build/parsePreamble.c 11 Jan 2009 18:50:31 - 2.171.2.5
+++ rpm/build/parsePreamble.c 4 Apr 2009 00:26:08 - 2.171.2.6
@@ -1182,6 +1182,24 @@
headerCopyTags(spec-packages-header, pkg-header,
(uint32_t *)copyTagsDuringParse);
+#ifdef RPM_VENDOR_PLD /* rpm-epoch0 */
+/* Add Epoch: 0 to package header if it was not set by spec */
+he-tag = RPMTAG_NAME;
+if (headerGet(spec-packages-header, he, 0) == 0) {
+ uint32_t num = 0;
+
+ he-tag = RPMTAG_EPOCH;
+ he-t = RPM_UINT32_TYPE;
+ he-p.ui32p = num;
+ he-c = 1;
+ xx = headerPut(pkg-header, he, 0);
+
+ /* also declare %{epoch} to be same */
+ addMacro(spec-macros, epoch, NULL, 0, RMIL_SPEC);
+}
+
+#endif /* RPM_VENDOR_PLD rpm-epoch0 */
+
if (checkForRequired(pkg-header, NVR) != RPMRC_OK)
return RPMRC_FAIL;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ parseDescription.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2009 05:37:52
Branch: HEAD Handle: 2009040403375100
Modified files:
rpm/build parseDescription.c
Log:
- jbj: sanity.
Summary:
RevisionChanges Path
2.43+1 -1 rpm/build/parseDescription.c
patch -p0 '@@ .'
Index: rpm/build/parseDescription.c
$ cvs diff -u -r2.42 -r2.43 parseDescription.c
--- rpm/build/parseDescription.c 3 Aug 2008 14:00:58 - 2.42
+++ rpm/build/parseDescription.c 4 Apr 2009 03:37:51 - 2.43
@@ -61,7 +61,7 @@
lang = RPMBUILD_DEFAULT_LANG;
optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
while ((arg = poptGetNextOpt(optCon)) 0)
- {};
+ {;}
if (name != NULL)
flag = PART_NAME;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c rpmtag.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2009 05:38:42
Branch: HEAD Handle: 2009040403384101
Modified files:
rpm CHANGES
rpm/rpmdb hdrfmt.c rpmtag.h
Log:
- jbj: yaml: add build scriptlet tags for --yaml/--xml display.
Summary:
RevisionChanges Path
1.2895 +1 -0 rpm/CHANGES
1.134 +8 -0 rpm/rpmdb/hdrfmt.c
1.62+14 -0 rpm/rpmdb/rpmtag.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2894 -r1.2895 CHANGES
--- rpm/CHANGES 2 Apr 2009 13:23:49 - 1.2894
+++ rpm/CHANGES 4 Apr 2009 03:38:41 - 1.2895
@@ -1,5 +1,6 @@
5.2a3 - 5.2a4:
+- jbj: yaml: add build scriptlet tags for --yaml/--xml display.
- jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc
fiddle-ups.
- jbj: yaml: add lsyck lua module to parse YAML.
- jbj: yaml: mix syck into the misc melange ...
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.133 -r1.134 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c27 Mar 2009 17:42:00 - 1.133
+++ rpm/rpmdb/hdrfmt.c4 Apr 2009 03:38:42 - 1.134
@@ -6143,10 +6143,14 @@
const char * tagN;
/* XXX display Tag_0x01234567 for arbitrary tags. */
if (tag-tagno != NULL tag-tagno[0] 0x4000) {
+#ifdef DYING /* XXX tagName() does this now */
(void) snprintf(numbuf, sizeof(numbuf), Tag_0x%08x,
(unsigned) tag-tagno[0]);
numbuf[sizeof(numbuf)-1] = '\0';
tagN = numbuf;
+#else
+ tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
+#endif
} else
tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
assert(tagN != NULL);/* XXX can't happen */
@@ -6160,10 +6164,14 @@
const char * tagN;
/* XXX display Tag_0x01234567 for arbitrary tags. */
if (tag-tagno != NULL tag-tagno[0] 0x4000) {
+#ifdef DYING /* XXX tagName() does this now */
(void) snprintf(numbuf, sizeof(numbuf), Tag_0x%08x,
(unsigned) tag-tagno[0]);
numbuf[sizeof(numbuf)-1] = '\0';
tagN = numbuf;
+#else
+ tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
+#endif
tagT = numElements 1
? RPM_ARRAY_RETURN_TYPE : RPM_SCALAR_RETURN_TYPE;
} else
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/rpmtag.h
$ cvs diff -u -r1.61 -r1.62 rpmtag.h
--- rpm/rpmdb/rpmtag.h27 Mar 2009 17:42:00 - 1.61
+++ rpm/rpmdb/rpmtag.h4 Apr 2009 03:38:42 - 1.62
@@ -423,12 +423,26 @@
RPMTAG_PACKAGEBASEURL= 1217, /* s */
RPMTAG_DISTEPOCH = 1218, /* s */
+RPMTAG_FILEDIGESTALGO = 5011, /* i file checksum algorithm */
+
/*...@-enummemuse@*/
RPMTAG_FIRSTFREE_TAG,/*! internal */
/*...@=enummemuse@*/
RPMTAG_PACKAGETRANSFLAGS = 0x4efaafd9, /* s[] arbitrary */
RPMTAG_PACKAGEDEPFLAGS = 0x748a8314, /* s[] arbitrary */
+
+RPMTAG_BUILDPREPPROG = 0x4ba37c9e, /* s[] arbitrary */
+RPMTAG_BUILDPREP = 0x799c0b4d, /* s[] arbitrary */
+RPMTAG_BUILDBUILDPROG= 0x6fb46014, /* s[] arbitrary */
+RPMTAG_BUILDBUILD= 0x5bae1a5a, /* s[] arbitrary */
+RPMTAG_BUILDINSTALLPROG = 0x70d4ab6f, /* s[] arbitrary */
+RPMTAG_BUILDINSTALL = 0x567f5983, /* s[] arbitrary */
+RPMTAG_BUILDCHECKPROG= 0x488a60ce, /* s[] arbitrary */
+RPMTAG_BUILDCHECK= 0x7f3b97b5, /* s[] arbitrary */
+RPMTAG_BUILDCLEANPROG= 0x42c93d41, /* s[] arbitrary */
+RPMTAG_BUILDCLEAN= 0x566042bf, /* s[] arbitrary */
+
RPMTAG_LASTARBITRARY_TAG = 0x8000 /*! internal */
};
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmdb/ hdrfmt.c rpmtag.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-Apr-2009 05:39:52
Branch: rpm-5_1 Handle: 2009040403395100
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/rpmdb hdrfmt.c rpmtag.h
Log:
- jbj: yaml: add build scriptlet tags for --yaml/--xml display.
Summary:
RevisionChanges Path
1.2288.2.271+1 -0 rpm/CHANGES
1.77.2.15 +8 -0 rpm/rpmdb/hdrfmt.c
1.44.2.8+14 -0 rpm/rpmdb/rpmtag.h
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2288.2.270 -r1.2288.2.271 CHANGES
--- rpm/CHANGES 3 Apr 2009 20:04:50 - 1.2288.2.270
+++ rpm/CHANGES 4 Apr 2009 03:39:51 - 1.2288.2.271
@@ -1,4 +1,5 @@
5.1.7 - 5.1.8:
+- jbj: yaml: add build scriptlet tags for --yaml/--xml display.
- jbj: eliminate rpmal debugging code.
- jbj: PLD: rpm-epoch0: Always add Epoch: 0 to packages.
- jbj: handle config(N) = E:V-R within rpmns.c (but treat as a string).
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.77.2.14 -r1.77.2.15 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c2 Apr 2009 17:44:46 - 1.77.2.14
+++ rpm/rpmdb/hdrfmt.c4 Apr 2009 03:39:51 - 1.77.2.15
@@ -6140,10 +6140,14 @@
const char * tagN;
/* XXX display Tag_0x01234567 for arbitrary tags. */
if (tag-tagno != NULL tag-tagno[0] 0x4000) {
+#ifdef DYING /* XXX tagName() does this now */
(void) snprintf(numbuf, sizeof(numbuf), Tag_0x%08x,
(unsigned) tag-tagno[0]);
numbuf[sizeof(numbuf)-1] = '\0';
tagN = numbuf;
+#else
+ tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
+#endif
} else
tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
assert(tagN != NULL);/* XXX can't happen */
@@ -6157,10 +6161,14 @@
const char * tagN;
/* XXX display Tag_0x01234567 for arbitrary tags. */
if (tag-tagno != NULL tag-tagno[0] 0x4000) {
+#ifdef DYING /* XXX tagName() does this now */
(void) snprintf(numbuf, sizeof(numbuf), Tag_0x%08x,
(unsigned) tag-tagno[0]);
numbuf[sizeof(numbuf)-1] = '\0';
tagN = numbuf;
+#else
+ tagN = myTagName(hsa-tags, tag-tagno[0], NULL);
+#endif
tagT = numElements 1
? RPM_ARRAY_RETURN_TYPE : RPM_SCALAR_RETURN_TYPE;
} else
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/rpmtag.h
$ cvs diff -u -r1.44.2.7 -r1.44.2.8 rpmtag.h
--- rpm/rpmdb/rpmtag.h29 Mar 2009 02:24:23 - 1.44.2.7
+++ rpm/rpmdb/rpmtag.h4 Apr 2009 03:39:51 - 1.44.2.8
@@ -423,12 +423,26 @@
RPMTAG_PACKAGEBASEURL= 1217, /* s */
RPMTAG_DISTEPOCH = 1218, /* s */
+RPMTAG_FILEDIGESTALGO = 5011, /* i file checksum algorithm */
+
/*...@-enummemuse@*/
RPMTAG_FIRSTFREE_TAG,/*! internal */
/*...@=enummemuse@*/
RPMTAG_PACKAGETRANSFLAGS = 0x4efaafd9, /* s[] arbitrary */
RPMTAG_PACKAGEDEPFLAGS = 0x748a8314, /* s[] arbitrary */
+
+RPMTAG_BUILDPREPPROG = 0x4ba37c9e, /* s[] arbitrary */
+RPMTAG_BUILDPREP = 0x799c0b4d, /* s[] arbitrary */
+RPMTAG_BUILDBUILDPROG= 0x6fb46014, /* s[] arbitrary */
+RPMTAG_BUILDBUILD= 0x5bae1a5a, /* s[] arbitrary */
+RPMTAG_BUILDINSTALLPROG = 0x70d4ab6f, /* s[] arbitrary */
+RPMTAG_BUILDINSTALL = 0x567f5983, /* s[] arbitrary */
+RPMTAG_BUILDCHECKPROG= 0x488a60ce, /* s[] arbitrary */
+RPMTAG_BUILDCHECK= 0x7f3b97b5, /* s[] arbitrary */
+RPMTAG_BUILDCLEANPROG= 0x42c93d41, /* s[] arbitrary */
+RPMTAG_BUILDCLEAN= 0x566042bf, /* s[] arbitrary */
+
RPMTAG_LASTARBITRARY_TAG = 0x8000 /*! internal */
};
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
