compatibility wrapper has been moved to upstream :)

3 files changed, 2 insertions, 160 deletions

diff --git a/parsehdlist.c b/parsehdlist.c
index bf1162e..32143e4 100644
--- a/parsehdlist.c
+++ b/parsehdlist.c
@@ -14,7 +14,7 @@
 
 #include <rpm/rpmlib.h>
 #if defined(RPM_FORMAT_VERSION) && RPM_FORMAT_VERSION >= 5
-#include "rpm5compat.h"
+#include <rpm/rpm4compat.h>
 #else
 #include <rpm/header.h>
 #endif
diff --git a/rpm2header.c b/rpm2header.c
index 429d816..e51cb9b 100644
--- a/rpm2header.c
+++ b/rpm2header.c
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <rpmlib.h>
 #if defined(RPM_FORMAT_VERSION) && RPM_FORMAT_VERSION >= 5
-#include "rpm5compat.h"
+#include <rpm/rpm4compat.h>
 #endif
 #include <rpm/rpmts.h>
 
diff --git a/rpm5compat.h b/rpm5compat.h
deleted file mode 100644
index fcdb327..0000000
--- a/rpm5compat.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright © 2008 Per Øyvind Karlsen <peroyvind@mandriva.org>
- *
- * $Id$
- */
-
-#define RPM_NULL_TYPE   0
-#define RPM_CHAR_TYPE   RPM_UINT8_TYPE
-#define RPM_INT8_TYPE   RPM_UINT8_TYPE
-#define RPM_INT16_TYPE  RPM_UINT16_TYPE
-#define RPM_INT32_TYPE  RPM_UINT32_TYPE
-
-#ifndef H_RPMEVR
-#include <rpm/rpmevr.h>
-#endif
-#ifndef H_RPMIO
-#include <rpm/rpmio.h>
-#endif
-#ifndef _H_PKGIO
-#include <rpm/pkgio.h>
-#endif
-#ifndef H_RPMCB
-#include <rpm/rpmcb.h>
-#endif
-#ifndef H_RPMTS
-#include <rpm/rpmts.h>
-#endif
-#ifndef _H_MACRO_
-#include <rpm/rpmmacro.h>
-#endif
-
-enum hMagic {
-	HEADER_MAGIC_NO             = 0,
-	HEADER_MAGIC_YES            = 1
-};
-
-
-typedef	uint32_t *	hTAG_t;
-typedef	uint32_t *	hTYP_t;
-typedef	const void *	hPTR_t;
-typedef	uint32_t *	hCNT_t;
-typedef	uint32_t	int_32;
-typedef	uint16_t	uint_16;
-typedef	uint8_t		byte;
-
-typedef	union hRET_s {
-	const void * ptr;
-	const char ** argv;
-	const char * str;
-	uint32_t * ui32p;
-	uint16_t * ui16p;
-	uint32_t * i32p;
-	uint16_t * i16p;
-	uint8_t * i8p;
-} * hRET_t;
-
-static inline int headerGetEntry(Header h, int_32 tag, hTYP_t type, void ** p, hCNT_t c){
-	HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
-	int rc;
-	
-	/* Always ensure to initialize */
-	*(void **)p = NULL;
-	he->tag = tag;
-	rc = headerGet(h, he, tag);
-	if (rc) {
-		if (type) *type = he->t;
-		if (p) *(void **) p = he->p.ptr;
-		if (c) *c = he->c;
-	}
-
-	return rc;
-}
-
-static int headerAddEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) {
-	HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = tag;
-	he->t = type;
-	he->p.str = p;
-	he->c = c;
-	return headerPut(h, he, 0);
-}
-
-static int headerRemoveEntry(Header h, int_32 tag) {
-	HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = tag;
-	return headerDel(h, he, 0);
-}
-
-int headerModifyEntry(Header h, int_32 tag, int_32 type, const void * p, int_32 c) {
-	HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
-
-	he->tag = tag;
-	he->t = type;
-	he->p.str = p;
-	he->c = c;
-	return headerMod(h, he, 0);
-
-}
-
-static int headerNextIterator(HeaderIterator hi, hTAG_t tag, hTYP_t type, hPTR_t * p, hCNT_t c) {
-	HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
-	
-	he->tag = (rpmTag)tag;
-	return headerNext(hi, he, 0);
-}
-
-static HeaderIterator headerFreeIterator(HeaderIterator hi) {
-	return headerFini(hi);
-}
-
-static HeaderIterator headerInitIterator(Header h){
-	return headerInit(h);
-}
-
-void * headerFreeData(const void * data, rpmTagType type) {
-	if (data)
-		free((void *)data);
-	return NULL;
-}
-
-static int headerWrite(void * _fd, Header h, enum hMagic magicp) {
-	const char item[] = "Header";
-	const char * msg = NULL;
-	rpmRC rc = rpmpkgWrite(item, _fd, h, &msg);
-	if (rc != RPMRC_OK) {
-		rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerWrite", item, msg);
-		rc = RPMRC_FAIL;
-	}
-	msg = _free(msg);
-	return rc;
-}
-
-static inline Header headerRead(void * _fd, enum hMagic magicp) {
-	const char item[] = "Header";
-	Header h = NULL;
-	const char * msg = NULL;
-	rpmRC rc = rpmpkgRead(item, _fd, &h, &msg);
-	switch (rc) {
-		default:
-			rpmlog(RPMLOG_ERR, "%s: %s: %s\n", "headerRead", item, msg);
-		case RPMRC_NOTFOUND:
-			h = NULL;
-		case RPMRC_OK:
-			break;
-	}
-	msg = _free(msg);
-	return h;
-}
-
-int rpmMachineScore(int type, const char * name) {
-	char * platform = rpmExpand(name, "-%{_real_vendor}-%{_target_os}%{?_gnu}", NULL);
-	int score = rpmPlatformScore(platform, NULL, 0);
-
-	_free(platform);
-	return score;
-}