This change may need some context ...
I'm in the process of completing --deb:control spewage.
In order to do that successfully, then file/soname dependencies need
to be mapped back to package dependencies, and translated from
foo >= E:V-R
to
foo (>= E:V-R)
syntax.
The mapping requires an rpmdb to do the necessary lookup.
At the same time, I'm adding a header extension to map
dependencies back to the package that supplies the
dependencies using headerSprintf().
73 de Jeff
On Jun 20, 2008, at 7:13 AM, Jeff Johnson wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
>
> ______________________________________________________________________
> ______
>
> Server: rpm5.org Name: Jeff Johnson
> Root: /v/rpm/cvs Email: jbj@rpm5.org
> Module: rpm Date: 20-Jun-2008
> 13:13:34
> Branch: HEAD Handle: 2008062011133301
>
> Modified files:
> rpm CHANGES
> rpm/lib .cvsignore query.c
>
> Log:
> - jbj: pass rpmdb to header format extenensions with header.
>
> Summary:
> Revision Changes Path
> 1.2428 +1 -0 rpm/CHANGES
> 1.14 +2 -0 rpm/lib/.cvsignore
> 2.202 +5 -1 rpm/lib/query.c
>
> ______________________________________________________________________
> ______
>
> patch -p0 <<'@@ .'
> Index: rpm/CHANGES
>
> ======================================================================
> ======
> $ cvs diff -u -r1.2427 -r1.2428 CHANGES
> --- rpm/CHANGES 20 Jun 2008 11:09:45 -0000 1.2427
> +++ rpm/CHANGES 20 Jun 2008 11:13:33 -0000 1.2428
> @@ -1,5 +1,6 @@
>
> 5.1.0 -> 5.2a0:
> + - jbj: pass rpmdb to header format extenensions with header.
> - jbj: move rpmevr.[ch] to -lrpmdb for use with header
> format extensions.
> - jbj: fix: "%description -n foo-bar" needs an additional
> comparison.
> - jbj: add non-{GIF,XPM} formats opaquely using arbitrary
> Icon: tagno.
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/lib/.cvsignore
>
> ======================================================================
> ======
> $ cvs diff -u -r1.13 -r1.14 .cvsignore
> --- rpm/lib/.cvsignore 11 Mar 2008 14:49:52 -0000 1.13
> +++ rpm/lib/.cvsignore 20 Jun 2008 11:13:34 -0000 1.14
> @@ -7,6 +7,8 @@
> tpgp
> tsbt
> .libs
> +*.gcda
> +*.gcno
> *.la
> *.lcd
> *.lo
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/lib/query.c
>
> ======================================================================
> ======
> $ cvs diff -u -r2.201 -r2.202 query.c
> --- rpm/lib/query.c 10 Mar 2008 04:46:13 -0000 2.201
> +++ rpm/lib/query.c 20 Jun 2008 11:13:34 -0000 2.202
> @@ -14,6 +14,7 @@
> #include <rpmio.h>
> #include <poptIO.h>
> #include <rpmtag.h>
> +#define _RPMTS_INTERNAL /* XXX for ts->rdb */
> #include <rpmcli.h>
>
> #include "rpmdb.h"
> @@ -180,7 +181,10 @@
> *te = '\0';
>
> if (qva->qva_queryFormat != NULL) {
> - const char * str = queryHeader(h, qva->qva_queryFormat);
> + const char * str;
> + (void) headerSetRpmdb(h, ts->rdb);
> + str = queryHeader(h, qva->qva_queryFormat);
> + (void) headerSetRpmdb(h, NULL);
> if (str) {
> size_t tx = (te - t);
>
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-cvs@rpm5.org
Received on Fri Jun 20 13:28:16 2008