RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 25-Dec-2008 23:11:38
Branch: HEAD Handle: 2008122522113800
Modified files:
rpm CHANGES
rpm/lib tgi.c
Log:
lib/tgi: fix build breakage.
Summary:
Revision Changes Path
1.2714 +7 -6 rpm/CHANGES
2.20 +6 -4 rpm/lib/tgi.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2713 -r1.2714 CHANGES
--- rpm/CHANGES 25 Dec 2008 21:22:45 -0000 1.2713
+++ rpm/CHANGES 25 Dec 2008 22:11:38 -0000 1.2714
@@ -1,12 +1,13 @@
5.2a2 -> 5.2a3:
- - proyvind: rpmz: merge with recent xz code to work with recent liblzma
API
+ - proyvind: lib/tgi: fix build breakage.
+ - proyvind: rpmio/rpmz: merge with recent xz code to work with recent
liblzma API
changes.
- - proyvind: lookup3: fix build breakage.
- - proyvind: tpw: fix linking against librpm.
- - proyvind: rpmtar: fix build breakage.
- - proyvind: rpmcpio: fix build breakage.
- - proyvind: tmacro: fix build breakage.
+ - proyvind: rpmio/lookup3: fix build breakage.
+ - proyvind: rpmio/tpw: fix linking against librpm.
+ - proyvind: rpmio/rpmtar: fix build breakage.
+ - proyvind: rpmio/rpmcpio: fix build breakage.
+ - proyvind: rpmio/tmacro: fix build breakage.
- proyvind: perl: clean out rest of warnings.
- proyvind: check return value for functions declared with attribute
warn_unused_result. (some inspired by rpm.org)
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/tgi.c
============================================================================
$ cvs diff -u -r2.19 -r2.20 tgi.c
--- rpm/lib/tgi.c 26 Feb 2008 20:42:00 -0000 2.19
+++ rpm/lib/tgi.c 25 Dec 2008 22:11:38 -0000 2.20
@@ -6,10 +6,12 @@
#include <mire.h>
#include <rpmcb.h>
+#include <rpmtag.h>
#include <rpmdb.h>
#include <rpmgi.h>
#include <rpmcli.h>
+#include <poptIO.h>
#include <rpmte.h>
@@ -127,7 +129,7 @@
{ "queryformat", '\0', POPT_ARG_STRING, &queryFormat, 0,
N_("use the following query format"), "QUERYFORMAT" },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliFtsPoptTable, 0,
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioFtsPoptTable, 0,
N_("File tree walk options for fts(3):"),
NULL },
@@ -159,8 +161,8 @@
if (optCon == NULL)
exit(EXIT_FAILURE);
- if (ftsOpts == 0)
- ftsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT);
+ if (rpmioFtsOpts == 0)
+ rpmioFtsOpts = (FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOSTAT);
if (gitagstr != NULL) {
gitag = tagValue(gitagstr);
@@ -189,7 +191,7 @@
gi = rpmgiNew(ts, gitag, gikeystr, 0);
- (void) rpmgiSetArgs(gi, av, ftsOpts, giFlags);
+ (void) rpmgiSetArgs(gi, av, rpmioFtsOpts, giFlags);
#if defined(REFERENCE_FORNOW)
if (fileURL[0] == '=') {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
