rpms/ovaldi/devel ovaldi-5.3-epoch.patch, NONE, 1.1 ovaldi.spec, 1.3, 1.4

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	ovaldi.spec 
Added Files:
	ovaldi-5.3-epoch.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


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ovaldi.spec	17 Jan 2008 16:44:44 -0000	1.3
+++ ovaldi.spec	24 Jan 2008 16:44:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ovaldi
 Version:        5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
@@ -9,6 +9,7 @@
 Source0:        http://oval.mitre.org/language/download/interpreter/version%{version}/interpreters.src-%{version}.tbz2
 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
@@ -24,6 +25,7 @@
 %setup -qn Interpreters
 %patch0 -p1 -b .respin20080115
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .epoch
 
 
 %build
@@ -59,6 +61,9 @@
 
 
 %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