RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Aug-2007 17:03:08
Branch: HEAD Handle: 2007080216030800
Modified files:
rpm CHANGES macros.in
rpm/lib formats.c rpmlib.h
Log:
- add RPMTAG_NVRA header extension.
Summary:
Revision Changes Path
1.1542 +4 -0 rpm/CHANGES
2.103 +28 -0 rpm/lib/formats.c
2.428 +1 -0 rpm/lib/rpmlib.h
1.191 +3 -1 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1541 -r1.1542 CHANGES
--- rpm/CHANGES 2 Aug 2007 12:45:43 -0000 1.1541
+++ rpm/CHANGES 2 Aug 2007 15:03:08 -0000 1.1542
@@ -1,5 +1,9 @@
4.5 -> 5.0:
+<<<<<<< CHANGES
+ - jbj: add RPMTAG_NVRA header extension.
+=======
- jbj: python ds.Uname getter for uname(...) dependencies.
+>>>>>>> 1.1541
- jbj: use rpmmg magic wrapper.
- jbj: add rpmmg magic wrapper.
- jbj: unsnarl __FUNCTION__ from system.h AutoFu.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/formats.c
============================================================================
$ cvs diff -u -r2.102 -r2.103 formats.c
--- rpm/lib/formats.c 26 Jul 2007 00:58:57 -0000 2.102
+++ rpm/lib/formats.c 2 Aug 2007 15:03:08 -0000 2.103
@@ -1602,6 +1602,33 @@
return 0;
}
+/**
+ * Retrieve N-V-R.A compound string from header.
+ * @param h header
+ * @retval *type tag type
+ * @retval *data tag value
+ * @retval *count no. of data items
+ * @retval *freeData data-was-malloc'ed indicator
+ * @return 0 on success
+ */
+static int nvraTag(Header h, /[EMAIL PROTECTED]@*/ rpmTagType * type,
+ /[EMAIL PROTECTED]@*/ const void ** data, /[EMAIL PROTECTED]@*/
int_32 * count,
+ /[EMAIL PROTECTED]@*/ int * freeData)
+ /[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno,
+ fileSystem, internalState @*/
+ /[EMAIL PROTECTED] *type, *data, *count, *freeData,
rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+ /[EMAIL PROTECTED] maxSet(type) >= 0 /\ maxSet(data) >= 0
+ /\ maxSet(count) >= 0 /\ maxSet(freeData) >= 0 @*/
+{
+ *type = RPM_STRING_TYPE;
+ *data = hGetNEVRA(h, NULL);
+ *count = 1;
+ *freeData = 1;
+
+ return 0;
+}
+
/[EMAIL PROTECTED]@*/ /* FIX: cast? */
const struct headerSprintfExtension_s rpmHeaderFormats[] = {
{ HEADER_EXT_TAG, "RPMTAG_CHANGELOGNAME", { changelognameTag } },
@@ -1624,6 +1651,7 @@
{ HEADER_EXT_TAG, "RPMTAG_TRIGGERCONDS", { triggercondsTag } },
{ HEADER_EXT_TAG, "RPMTAG_TRIGGERTYPE", { triggertypeTag } },
{ HEADER_EXT_TAG, "RPMTAG_DBINSTANCE", { dbinstanceTag } },
+ { HEADER_EXT_TAG, "RPMTAG_NVRA", { nvraTag } },
{ HEADER_EXT_FORMAT, "armor", { armorFormat } },
{ HEADER_EXT_FORMAT, "base64", { base64Format } },
{ HEADER_EXT_FORMAT, "depflags", { depflagsFormat } },
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
============================================================================
$ cvs diff -u -r2.427 -r2.428 rpmlib.h
--- rpm/lib/rpmlib.h 26 Jul 2007 00:58:57 -0000 2.427
+++ rpm/lib/rpmlib.h 2 Aug 2007 15:03:08 -0000 2.428
@@ -427,6 +427,7 @@
RPMTAG_BUILDPROVIDES = 1193, /* internal */
RPMTAG_BUILDOBSOLETES = 1194, /* internal */
RPMTAG_DBINSTANCE = 1195, /* i */
+ RPMTAG_NVRA = 1196, /* s */
/[EMAIL PROTECTED]@*/
RPMTAG_FIRSTFREE_TAG /*!< internal */
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.190 -r1.191 macros.in
--- rpm/macros.in 25 Jul 2007 16:56:08 -0000 1.190
+++ rpm/macros.in 2 Aug 2007 15:03:08 -0000 1.191
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.190 2007/07/25 16:56:08 jbj Exp $
+# $Id: macros.in,v 1.191 2007/08/02 15:03:08 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -672,6 +672,7 @@
%_dbi_config_3_Triggername %{_dbi_btconfig}
%_dbi_config_3_Packages %{_dbi_btconfig} lockdbfd
%_dbi_config_3_Depends %{_dbi_btconfig} temporary private
+%_dbi_config_3_Nvra %{_dbi_btconfig}
# database configuration: SQLite [dbapi 4 hooks]
%_dbi_config_4 %{_dbi_sqlconfig}
@@ -694,6 +695,7 @@
%_dbi_config_4_Triggername %{_dbi_sqlconfig}
%_dbi_config_4_Packages %{_dbi_sqlconfig}
%_dbi_config_4_Depends %{_dbi_sqlconfig} temporary private
+%_dbi_config_4_Nvra %{_dbi_btconfig}
# database configuration [code entry hooks]
%_dbi_config %{expand:%%{_dbi_config_%{_dbapi_used}}}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
