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

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	.cvsignore ovaldi-5.3-gcc43.patch ovaldi.spec sources 
Removed Files:
	ovaldi-5.3-int.patch 
Log Message:
New upstream release



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

ovaldi-5.3-gcc43.patch:

Index: ovaldi-5.3-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi-5.3-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ovaldi-5.3-gcc43.patch	3 Jan 2008 21:25:10 -0000	1.1
+++ ovaldi-5.3-gcc43.patch	17 Jan 2008 16:44:44 -0000	1.2
@@ -4,9 +4,9 @@
 
 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
+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>
@@ -15,25 +15,25 @@
  
  #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 @@
+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>
- #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 @@
+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: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ovaldi.spec	3 Jan 2008 21:25:10 -0000	1.2
+++ ovaldi.spec	17 Jan 2008 16:44:44 -0000	1.3
@@ -1,19 +1,17 @@
 Name:           ovaldi
 Version:        5.3
-Release:        2%{?dist}
+Release:        3%{?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
 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
@@ -24,7 +22,7 @@
 
 %prep
 %setup -qn Interpreters
-%patch0 -p0 -b .int
+%patch0 -p1 -b .respin20080115
 %patch1 -p1 -b .gcc43
 
 
@@ -61,6 +59,9 @@
 
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Nov 2007 20:09:52 -0000	1.2
+++ sources	17 Jan 2008 16:44:44 -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 ---