rpms/ovaldi/EL-5 ovaldi-5.3-epoch.patch, NONE, 1.1 ovaldi-5.3-gcc43.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ovaldi.spec, 1.1, 1.2 sources, 1.2, 1.3 ovaldi-5.3-int.patch, 1.1, NONE

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15317/EL-5

Modified Files:
	.cvsignore ovaldi.spec sources 
Added Files:
	ovaldi-5.3-epoch.patch ovaldi-5.3-gcc43.patch 
Removed Files:
	ovaldi-5.3-int.patch 
Log Message:
Fix handling of epochs


ovaldi-5.3-epoch.patch:

--- NEW FILE ovaldi-5.3-epoch.patch ---
--- ./Interpreters.orig/src/EntityComparator.cpp	2008-01-24 17:39:58.000000000 +0100
+++ ./Interpreters/src/EntityComparator.cpp	2008-01-24 17:40:21.000000000 +0100
@@ -114,19 +114,16 @@ OvalEnum::ResultEnumeration EntityCompar
 
 	int sense = 1; // default to later
 
-	if(installedEpochStr.compare(defEpochStr) == 0) {
+	int defEpochInt = atoi(defEpochStr.c_str());
+	int installedEpochInt = atoi(installedEpochStr.c_str());
+
+	if(defEpochInt == installedEpochInt) {
 		sense = rpmvercmp(installedVersionStr.c_str(),defVersionStr.c_str());
 		if (sense == 0) {
 			sense = rpmvercmp(installedReleaseStr.c_str(),defReleaseStr.c_str());
 		}
 	} else {
-		int installedEpochInt = atoi(defEpochStr.c_str());
-		int defEpochInt = atoi(installedEpochStr.c_str());
-		if(installedEpochInt > 0) {
-			sense = 1;
-		} else if(defEpochInt > 0) {
-			sense = -1;
-		}
+		sense = (installedEpochInt > defEpochInt)? 1 : -1;
 	}
 
 	// convert sense value to a result based on operator

ovaldi-5.3-gcc43.patch:

--- NEW FILE ovaldi-5.3-gcc43.patch ---
The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.3

Lubomir Kundrak <lkundrak at redhat.com>

diff -urp Interpreters.orig/src/AbsObjectCollector.h Interpreters/src/AbsObjectCollector.h
--- Interpreters.orig/src/AbsObjectCollector.h	2008-01-17 16:10:02.000000000 +0100
+++ Interpreters/src/AbsObjectCollector.h	2008-01-17 16:08:53.000000000 +0100
@@ -46,6 +46,7 @@
 #include <vector>
 #include <iostream>
 #include <stdlib.h>
+#include <typeinfo>
 
 #include "OvalEnum.h"
 #include "Filter.h"
diff -urp Interpreters.orig/src/Common.h Interpreters/src/Common.h
--- Interpreters.orig/src/Common.h	2008-01-17 16:10:02.000000000 +0100
+++ Interpreters/src/Common.h	2008-01-17 16:08:53.000000000 +0100
@@ -47,6 +47,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <set>
 #include <time.h>
diff -urp Interpreters.orig/src/REGEX.h Interpreters/src/REGEX.h
--- Interpreters.orig/src/REGEX.h	2008-01-17 16:10:02.000000000 +0100
+++ Interpreters/src/REGEX.h	2008-01-17 16:09:25.000000000 +0100
@@ -40,6 +40,7 @@
 
 #include <sstream>
 #include <string>
+#include <cstring>
 #include <vector>
 
 using namespace std;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Nov 2007 20:25:51 -0000	1.2
+++ .cvsignore	24 Jan 2008 16:44:42 -0000	1.3
@@ -1 +1,2 @@
 interpreters.src-5.3.tbz2
+ovaldi-5.3-respin20080115.patch.gz


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-5/ovaldi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ovaldi.spec	28 Nov 2007 20:25:51 -0000	1.1
+++ ovaldi.spec	24 Jan 2008 16:44:42 -0000	1.2
@@ -1,18 +1,18 @@
 Name:           ovaldi
 Version:        5.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
 License:        BSD
 URL:            http://oval.mitre.org/language/download/interpreter/index.html
 Source0:        http://oval.mitre.org/language/download/interpreter/version%{version}/interpreters.src-%{version}.tbz2
-Patch0:         ovaldi-5.3-int.patch
+Patch0:         ovaldi-5.3-respin20080115.patch.gz
+Patch1:         ovaldi-5.3-gcc43.patch
+Patch2:         ovaldi-5.3-epoch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel
-# rpm-devel should pull in popt-devel. This is fixed in Fedora 9
-BuildRequires:  popt-devel
 
 %description
 The OVAL Interpreter is a freely available reference implementation created
@@ -23,7 +23,9 @@
 
 %prep
 %setup -qn Interpreters
-%patch0 -p0 -b .int
+%patch0 -p1 -b .respin20080115
+%patch1 -p1 -b .gcc43
+%patch2 -p1 -b .epoch
 
 
 %build
@@ -59,6 +61,14 @@
 
 
 %changelog
+* Thu Jan 24 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.3-4
+- Fix handling of epochs
+
+* Thu Jan 17 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.3-3
+- Basically a new upstream release with the same version number
+
+* Thu Jan 03 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.3-2
+- Adding missing includes to fix build with gcc-4.3
 
 * Mon Nov 19 2007 Lubomir Kundrak <lkundrak at redhat.com> 5.3-1
 - Initial package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Nov 2007 20:25:51 -0000	1.2
+++ sources	24 Jan 2008 16:44:42 -0000	1.3
@@ -1 +1,2 @@
 5af68d5e0b8f51891b23a52f019741e8  interpreters.src-5.3.tbz2
+989089809e96fa66c63b7a61ec44a672  ovaldi-5.3-respin20080115.patch.gz


--- ovaldi-5.3-int.patch DELETED ---