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 19:18:43
Branch: HEAD Handle: 2008122518184200
Modified files:
rpm CHANGES
rpm/rpmio rpmtar.c
Log:
rpmtar: fix build breakage.
Summary:
Revision Changes Path
1.2710 +1 -0 rpm/CHANGES
1.24 +3 -3 rpm/rpmio/rpmtar.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2709 -r1.2710 CHANGES
--- rpm/CHANGES 25 Dec 2008 18:11:51 -0000 1.2709
+++ rpm/CHANGES 25 Dec 2008 18:18:42 -0000 1.2710
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - proyvind: rpmtar: fix build breakage.
- proyvind: rpmcpio: fix build breakage.
- proyvind: tmacro: fix build breakage.
- proyvind: perl: clean out rest of warnings.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtar.c
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpmtar.c
--- rpm/rpmio/rpmtar.c 15 Dec 2008 22:43:44 -0000 1.23
+++ rpm/rpmio/rpmtar.c 25 Dec 2008 18:18:42 -0000 1.24
@@ -94,8 +94,6 @@
typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmts_s * rpmts;
typedef /*...@abstract@*/ struct rpmte_s * rpmte;
-#define _RPMFI_INTERNAL
-#include "../lib/rpmfi.h"
#define _IOSM_INTERNAL
#include <iosm.h> /* XXX CPIO_FOO/FSM_FOO constants */
@@ -106,13 +104,15 @@
typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmds_s * rpmds;
typedef struct rpmRelocation_s * rpmRelocation;
+#define _RPMFI_INTERNAL
+#include "../lib/rpmfi.h"
+
typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmdb_s * rpmdb;
typedef /*...@abstract@*/ struct rpmdbMatchIterator_s * rpmdbMatchIterator;
typedef struct rpmPRCO_s * rpmPRCO;
typedef struct Spec_s * Spec;
#include "../lib/rpmts.h"
-typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmpsm_s * rpmpsm;
#define _RPMSQ_INTERNAL
#include "../lib/psm.h"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
