rpms/ovaldi/devel ovaldi-5.3-gcc43.patch, NONE, 1.1 ovaldi.spec, 1.1, 1.2

Lubomir Kundrak (lkundrak) fedora-extras-commits at redhat.com
Thu Jan 3 21:25:49 UTC 2008


Author: lkundrak

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

Modified Files:
	ovaldi.spec 
Added Files:
	ovaldi-5.3-gcc43.patch 
Log Message:
Adding missing includes to fix build with gcc-4.3

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 -rup Interpreters.orig/src/AbsObjectCollector.h Interpreters/src/AbsObjectCollector.h
--- Interpreters.orig/src/AbsObjectCollector.h	2007-06-22 15:51:50.000000000 +0200
+++ Interpreters/src/AbsObjectCollector.h	2008-01-03 21:17:56.000000000 +0100
@@ -46,6 +46,7 @@
 #include <vector>
 #include <iostream>
 #include <stdlib.h>
+#include <typeinfo>
 
 #include "OvalEnum.h"
 #include "Filter.h"
diff -rup Interpreters.orig/src/Common.h Interpreters/src/Common.h
--- Interpreters.orig/src/Common.h	2007-06-26 22:08:22.000000000 +0200
+++ Interpreters/src/Common.h	2008-01-03 22:12:41.000000000 +0100
@@ -45,6 +45,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <time.h>
 #include <sstream>
diff -rup Interpreters.orig/src/REGEX.h Interpreters/src/REGEX.h
--- Interpreters.orig/src/REGEX.h	2007-03-29 20:16:55.000000000 +0200
+++ Interpreters/src/REGEX.h	2008-01-03 22:15:45.000000000 +0100
@@ -39,6 +39,7 @@
 
 #include <sstream>
 #include <string>
+#include <cstring>
 
 using namespace std;
 


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ovaldi.spec	28 Nov 2007 19:25:53 -0000	1.1
+++ ovaldi.spec	3 Jan 2008 21:25:10 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           ovaldi
 Version:        5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
 Group:          Applications/System
@@ -8,6 +8,7 @@
 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
+Patch1:         ovaldi-5.3-gcc43.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 @@
 %prep
 %setup -qn Interpreters
 %patch0 -p0 -b .int
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -59,6 +61,8 @@
 
 
 %changelog
+* 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




More information about the fedora-extras-commits mailing list