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: 28-Apr-2008 00:32:27
Branch: rpm-4_5 Handle: 2008042722322700
Modified files: (Branch: rpm-4_5)
rpm/tools Makefile.am rpmrepo.c
Log:
- jbj: add defines for rpm-4.5 compatibility compile.
Summary:
Revision Changes Path
2.85.2.4 +1 -0 rpm/tools/Makefile.am
1.1.2.2 +29 -3 rpm/tools/rpmrepo.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.85.2.3 -r2.85.2.4 Makefile.am
--- rpm/tools/Makefile.am 27 Apr 2008 22:11:54 -0000 2.85.2.3
+++ rpm/tools/Makefile.am 27 Apr 2008 22:32:27 -0000 2.85.2.4
@@ -36,5 +36,6 @@
rpmdeps_SOURCES = rpmdeps.c
rpmrepo_SOURCES = rpmrepo.c
+rpmrepo_LDADD = $(LDADD) -lsqlite3
$(PROGRAMS): $(LDADD)
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmrepo.c
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmrepo.c
--- rpm/tools/rpmrepo.c 27 Apr 2008 22:11:54 -0000 1.1.2.1
+++ rpm/tools/rpmrepo.c 27 Apr 2008 22:32:27 -0000 1.1.2.2
@@ -2,6 +2,23 @@
* \file rpmio/rpmrepo.c
*/
+#define WITH_SQLITE
+
+#define Realpath realpath
+#define Closedir closedir
+
+#define rpmioInit rpmcliInit
+#define rpmioFini rpmcliFini
+
+#define rpmioFtsOpts ftsOpts
+#define rpmioDigestHashAlgo rpmDigestHashAlgo
+#define rpmioDigestPoptTable rpmDigestPoptTable
+
+#define rpmioFtsPoptTable rpmcliFtsPoptTable
+#define rpmioAllPoptTable rpmcliAllPoptTable
+
+#define tagClean(_p)
+
#include "system.h"
#if defined(WITH_SQLITE)
@@ -47,10 +64,8 @@
#include <fts.h>
#include <argv.h>
#include <mire.h>
-#include <poptIO.h>
-#include <rpmtag.h>
-#include <rpmlib.h> /* XXX for rpmts typedef */
+#include <rpmcli.h>
#include <rpmts.h>
#include "debug.h"
@@ -795,6 +810,7 @@
}
#endif
+#if defined(RPMMIRE_PCRE)
/* Should this element be excluded/included? */
/* XXX todo: apply globs to fts_path rather than fts_name? */
/[EMAIL PROTECTED]@*/
@@ -803,6 +819,7 @@
if (mireApply(repo->includeMire, repo->nincludes, p->fts_name, 0, +1) <
0)
continue;
/[EMAIL PROTECTED]@*/
+#endif
switch (p->fts_info) {
case FTS_D:
@@ -1699,6 +1716,8 @@
N_("output more debugging info."), NULL },
{ "dryrun", '\0', POPT_ARG_VAL, &__rpmrepo.dryrun, 1,
N_("sanity check arguments, don't create metadata"), NULL },
+
+#if defined(RPMMIRE_PCRE)
#if defined(POPT_ARG_ARGV)
{ "excludes", 'x', POPT_ARG_ARGV, &__rpmrepo.exclude_patterns, 0,
N_("glob PATTERN(s) to exclude"), N_("PATTERN") },
@@ -1713,6 +1732,8 @@
{ "includes", 'i', POPT_ARG_STRING, NULL, 'i',
N_("glob PATTERN(s) to include"), N_("PATTERN") },
#endif
+#endif
+
#ifdef NOTYET
{ "basedir", '\0', POPT_ARG_STRING|POPT_ARGFLAG_DOC_HIDDEN,
&__rpmrepo.basedir, 0,
N_("top level directory"), N_("DIR") },
@@ -1920,6 +1941,7 @@
}
#endif
+#if defined(RPMMIRE_PCRE)
/* Set up mire patterns (no error returns with globs, easy pie). */
if (mireLoadPatterns(RPMMIRE_GLOB, 0, repo->exclude_patterns, NULL,
&repo->excludeMire, &repo->nexcludes))
@@ -1927,6 +1949,7 @@
if (mireLoadPatterns(RPMMIRE_GLOB, 0, repo->include_patterns, NULL,
&repo->includeMire, &repo->nincludes))
repo_error(1, _("Error loading include glob patterns."));
+#endif
/* Load the rpm list from a multi-rooted directory traversal. */
if (repo->directories != NULL) {
@@ -1977,12 +2000,15 @@
repo->pkglist = argvFree(repo->pkglist);
repo->directories = argvFree(repo->directories);
repo->manifests = argvFree(repo->manifests);
+
+#if defined(RPMMIRE_PCRE)
/[EMAIL PROTECTED] -refcounttrans @*/
repo->excludeMire = mireFreeAll(repo->excludeMire, repo->nexcludes);
repo->includeMire = mireFreeAll(repo->includeMire, repo->nincludes);
/[EMAIL PROTECTED] =refcounttrans @*/
repo->exclude_patterns = argvFree(repo->exclude_patterns);
repo->include_patterns = argvFree(repo->include_patterns);
+#endif
tagClean(NULL);
optCon = rpmioFini(optCon);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
