rpms/ovaldi/devel ovaldi-5.4.2-rpm46.patch, NONE, 1.1 ovaldi.spec, 1.8, 1.9

[Lubomir Rintel (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28030

Modified Files:
	ovaldi.spec 
Added Files:
	ovaldi-5.4.2-rpm46.patch 
Log Message:
Add RPM > 4.4 patch

ovaldi-5.4.2-rpm46.patch:

--- NEW FILE ovaldi-5.4.2-rpm46.patch ---
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 at 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;
 };


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ovaldi.spec	13 Jul 2008 10:12:49 -0000	1.8
+++ ovaldi.spec	13 Jul 2008 12:44:39 -0000	1.9
@@ -7,9 +7,10 @@
 License:        BSD
 URL:            http://oval.mitre.org/language/download/interpreter/index.html
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Patch0:         ovaldi-5.4.2-rpm46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel
+BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel > 4.4
 BuildRequires:  dos2unix
 
 %description
@@ -21,6 +22,7 @@
 
 %prep
 %setup -qn %{name}-%{version}-src
+%patch0 -p1 -b .rpm46
 # Nuke non-utf8 character
 sed 's/[^ ] USEFUL LINKS/- USEFUL LINKS/' -i docs/README.txt
 # Convert CRLF
@@ -32,7 +34,7 @@
 %build
 mkdir -p project/linux/Release/obj
 # %{?_smp_mflags} can not be used
-make -C project/linux CPPFLAGS='%{optflags}'
+make -C project/linux CPPFLAGS='%{optflags} -D_RPM_4_4_COMPAT'
 
 
 %install
@@ -67,7 +69,7 @@
 
 %changelog
 * Sun Jul 13 2008 Lubomir Rintel <lkundrak at v3.sk> 5.4.2-2
-- Rebuild against newer librpm
+- Adjust for newer librpm
 
 * Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.4.2-1
 - New upstream release, all patches got merged