rpms/ovaldi/devel .cvsignore, 1.3, 1.4 ovaldi.spec, 1.6, 1.7 sources, 1.3, 1.4 ovaldi-5.3-epoch.patch, 1.2, NONE ovaldi-5.3-gcc43.patch, 1.2, NONE

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

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

Modified Files:
	.cvsignore ovaldi.spec sources 
Removed Files:
	ovaldi-5.3-epoch.patch ovaldi-5.3-gcc43.patch 
Log Message:
* Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.4.2-1
- New upstream release, all patches got merged
- Add /usr/share/ovaldi/xml symlink, to be compatible with Debian


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Jan 2008 16:44:44 -0000	1.3
+++ .cvsignore	24 Apr 2008 12:04:28 -0000	1.4
@@ -1,2 +1 @@
-interpreters.src-5.3.tbz2
-ovaldi-5.3-respin20080115.patch.gz
+ovaldi-5.4.2-src.tar.bz2


Index: ovaldi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/ovaldi.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ovaldi.spec	11 Feb 2008 14:21:07 -0000	1.6
+++ ovaldi.spec	24 Apr 2008 12:04:30 -0000	1.7
@@ -1,18 +1,16 @@
 Name:           ovaldi
-Version:        5.3
-Release:        6%{?dist}
+Version:        5.4.2
+Release:        1%{?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-respin20080115.patch.gz
-Patch1:         ovaldi-5.3-gcc43.patch
-Patch2:         ovaldi-5.3-epoch.patch
+Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcre-devel xerces-c-devel xalan-c-devel rpm-devel
+BuildRequires:  dos2unix
 
 %description
 The OVAL Interpreter is a freely available reference implementation created
@@ -22,10 +20,13 @@
 
 
 %prep
-%setup -qn Interpreters
-%patch0 -p1 -b .respin20080115
-%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .epoch
+%setup -qn %{name}-%{version}-src
+# Nuke non-utf8 character
+sed 's/[^ ] USEFUL LINKS/- USEFUL LINKS/' -i docs/README.txt
+# Convert CRLF
+dos2unix -k -q docs/README.txt
+dos2unix -k -q docs/version.txt
+dos2unix -k -q docs/terms.txt
 
 
 %build
@@ -47,6 +48,10 @@
 install -m 644 docs/ovaldi.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 644 xml/* $RPM_BUILD_ROOT%{_datadir}/ovaldi
 
+# For compatibility with Debian definitions, which hardcode
+# schema paths
+ln -sf . $RPM_BUILD_ROOT%{_datadir}/ovaldi/xml
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +66,10 @@
 
 
 %changelog
+* Mon Apr 21 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.4.2-1
+- New upstream release, all patches got merged
+- Add /usr/share/ovaldi/xml symlink, to be compatible with Debian
+
 * Mon Feb 11 2008 Lubomir Kundrak <lkundrak at redhat.com> 5.3-6
 - Rebuild for newer xerces-c
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ovaldi/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Jan 2008 16:44:44 -0000	1.3
+++ sources	24 Apr 2008 12:04:30 -0000	1.4
@@ -1,2 +1 @@
-5af68d5e0b8f51891b23a52f019741e8  interpreters.src-5.3.tbz2
-989089809e96fa66c63b7a61ec44a672  ovaldi-5.3-respin20080115.patch.gz
+bb55568a52fb03894cdb9e54bb7709c4  ovaldi-5.4.2-src.tar.bz2


--- ovaldi-5.3-epoch.patch DELETED ---


--- ovaldi-5.3-gcc43.patch DELETED ---