Be compatible with upcoming rpm-4.6.

Still needs to be compiled with -D_RPM_4_4_COMPAT,
but probably the only change to avoid it would be s/int_32/unit32_t/

Lubomir Rintel <lkundrak@v3.sk>

diff -urp ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.cpp ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.cpp
--- ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.cpp	2008-01-25 19:13:53.000000000 +0100
+++ ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.cpp	2008-07-13 14:28:26.000000000 +0200
@@ -380,11 +380,11 @@ void RPMInfoProbe::GetRPMInfo(string nam
   rpmtsFree(ts);
 }
 
-char* RPMInfoProbe::readHeaderString(Header header, int_32 tag_id) {
+char* RPMInfoProbe::readHeaderString(Header header, rpmTag tag_id) {
   // This function is from the Red Hat RPM Guide //
-  int_32 type;
+  rpmTagType type;
   void *pointer;
-  int_32 data_size;
+  rpm_count_t data_size;
 
   int header_status = headerGetEntry(header,
 				     tag_id,
@@ -402,11 +402,11 @@ char* RPMInfoProbe::readHeaderString(Hea
   return (NULL);
 }
 
-int_32 RPMInfoProbe::readHeaderInt32(Header header, int_32 tag_id) {
+int_32 RPMInfoProbe::readHeaderInt32(Header header, rpmTag tag_id) {
   // This function is from the Red Hat RPM Guide //
-  int_32 type;
+  rpmTagType type;
   void *pointer;
-  int_32 data_size;
+  rpm_count_t data_size;
 
   int header_status = headerGetEntry(header,
 				     tag_id,
@@ -497,7 +497,7 @@ void RPMInfoProbe::ChildGetSigKeyId(int 
             fprintf(stderr, "no arguments given for --query");
             exit(EXIT_FAILURE);
 		}
-        ec = rpmcliQuery(ts, qva, (const char **) poptGetArgs(context));
+        ec = rpmcliQuery(ts, qva, (char * const *) poptGetArgs(context));
 
 	} else {
 		cerr << "Unable to get sig key id for rpm: " << rpmName << endl;        
diff -urp ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.h ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.h
--- ovaldi-5.4.2-src.orig/src/probes/linux/RPMInfoProbe.h	2008-01-25 19:13:53.000000000 +0100
+++ ovaldi-5.4.2-src/src/probes/linux/RPMInfoProbe.h	2008-07-13 14:26:02.000000000 +0200
@@ -106,8 +106,8 @@ private:
 	string GetSigKeyId(string rpmName);
 
 	string readHeaderBinary(Header header, int_32 tag_id);
-	char *readHeaderString(Header header, int_32 tag_id);
-	int_32 readHeaderInt32(Header header, int_32 tag_id);
+	char *readHeaderString(Header header, rpmTag tag_id);
+	int_32 readHeaderInt32(Header header, rpmTag tag_id);
 
 	static RPMInfoProbe *instance;
 };
diff -urp ovaldi-5.4.2-src.orig/project/linux/Makefile ovaldi-5.4.2-src/project/linux/Makefile
--- ovaldi-5.4.2-src.orig/project/linux/Makefile	2008-02-19 18:23:09.000000000 +0100
+++ ovaldi-5.4.2-src/project/linux/Makefile	2008-07-13 15:09:02.000000000 +0200
@@ -65,7 +65,7 @@ PACKAGE_DPKG = $(shell /usr/bin/env dpkg
 PACKAGE_MANAGERS = 
 
 ifneq (${PACKAGE_RPM}, )
-	LIBS += -lrpm -lrpmdb -lrpmio
+	LIBS += -lrpm -lrpmio
 	PACKAGE_MANAGERS += -DPACKAGE_RPM
 endif
 ifneq (${PACKAGE_DPKG}, )