rpms/ovaldi/EL-6 import.log, NONE, 1.1 .cvsignore, 1.7, 1.8 ovaldi.spec, 1.15, 1.16 sources, 1.7, 1.8

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/ovaldi/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13470/EL-6

Modified Files:
	.cvsignore ovaldi.spec sources 
Added Files:
	import.log 
Log Message:
Pull from devel


--- NEW FILE import.log ---
ovaldi-5_6_4-1_fc14:EL-6:ovaldi-5.6.4-1.fc14.src.rpm:1278621903


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	7 Sep 2009 11:00:55 -0000	1.7
+++ .cvsignore	8 Jul 2010 20:45:26 -0000	1.8
@@ -1 +1 @@
-ovaldi-5.5.25-src.zip
+ovaldi-5.6.4-src.zip


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-6/ovaldi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ovaldi.spec	7 Sep 2009 11:00:55 -0000	1.15
+++ ovaldi.spec	8 Jul 2010 20:45:26 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           ovaldi
-Version:        5.5.25
+Version:        5.6.4
 Release:        1%{?dist}
 Summary:        Reference implementation of the OVAL interpreter
 
@@ -8,9 +8,12 @@ License:        BSD
 URL:            http://oval.mitre.org/language/download/interpreter/index.html
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.zip
 Patch0:         ovaldi-5.4.2-rpm46.patch
+Patch1:         ovaldi-5.6.4-build.patch
+Patch2:         ovaldi-5.6.4-xerces.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel > 4.4
+BuildRequires:  openldap-devel openssl-devel
 BuildRequires:  dos2unix
 
 %description
@@ -23,6 +26,8 @@ report the results of the tests.
 %prep
 %setup -qn %{name}-%{version}-src
 %patch0 -p1 -b .rpm46
+%patch1 -p1 -b .build
+%patch2 -p1 -b .xerces
 # Nuke non-utf8 character
 sed 's/[^ ] USEFUL LINKS/- USEFUL LINKS/' -i docs/README.txt
 # Convert CRLF
@@ -68,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 05 2010 Lubomir Rintel <lkundrak at v3.sk> 5.6.4-1
+- Rebase to later upstream release
+
+* Fri Dec 11 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-2
+- Rebuild for RPM 4.8.0
+
 * Mon Sep 07 2009 Lubomir Rintel <lkundrak at v3.sk> 5.5.25-1
 - New upstream relase
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/EL-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2009 11:00:55 -0000	1.7
+++ sources	8 Jul 2010 20:45:26 -0000	1.8
@@ -1 +1 @@
-f450664a2f1ee06a86947606217022f9  ovaldi-5.5.25-src.zip
+8ad52c3e270c48fff846d265fb638781  ovaldi-5.6.4-src.zip