upgrade to 0.6.0

.cvsignore

@@ -1 +1 @@
-openscap-0.5.12.tar.gz
+openscap-0.6.0.tar.gz

openscap-0.5.12-config.patch

@@ -1,23 +0,0 @@
-diff -up openscap-0.5.12/dist/fedora/oscap-scan.cron.config openscap-0.5.12/dist/fedora/oscap-scan.cron
---- openscap-0.5.12/dist/fedora/oscap-scan.cron.config	2010-07-01 16:28:42.938477993 +0200
-+++ openscap-0.5.12/dist/fedora/oscap-scan.cron	2010-07-01 16:28:52.484770650 +0200
-@@ -5,8 +5,8 @@
- # sent to root mail. Please configure oscap-scan options before you use it!
- ##########
- 
--#OPTIONS="/usr/share/openscap/scap-fedora12-oval.xml"
--PROG="/usr/bin/oscap-scan"
-+#OPTIONS="/usr/share/openscap/scap-fedora13-oval.xml"
-+PROG="/usr/bin/oscap"
- if [ x"$OPTIONS" == "x" ]
- then
- 	logger "OpenSCAP security scan: NOT CONFIGURED. (Cron job)"
-diff -up openscap-0.5.12/dist/fedora/oscap-scan.sys.config openscap-0.5.12/dist/fedora/oscap-scan.sys
---- openscap-0.5.12/dist/fedora/oscap-scan.sys.config	2010-07-01 16:27:47.113740942 +0200
-+++ openscap-0.5.12/dist/fedora/oscap-scan.sys	2010-07-01 16:27:53.750477554 +0200
-@@ -1,4 +1,4 @@
- 
- #oscap-scan command line options:
--#OPTIONS="-q oval eval --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora12-oval.xml"
-+#OPTIONS="-q oval eval --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora13-oval.xml"
- 

openscap.spec

@@ -2,14 +2,13 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.5.12
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.open-scap.org/
 Source0:        http://www.open-scap.org/download/%{name}-%{version}.tar.gz
-Patch1:         openscap-0.5.12-config.patch      
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  swig libxml2-devel
 BuildRequires:  rpm-devel
@@ -66,10 +65,9 @@ The %{name}-utils package contains various utilities based on %{name} library.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
-%configure --disable-debug
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +105,7 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
 %{_libexecdir}/*
+%{_datadir}/openscap/schemas/*
 
 %files python
 %defattr(-,root,root,-)
@@ -127,12 +126,17 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan
 %{_initrddir}/oscap-scan
-%{_datadir}/openscap/*
+%{_datadir}/openscap/oscap-scan.cron
+%{_datadir}/openscap/scap-fedora12-oval.xml
+%{_datadir}/openscap/scap-fedora13-oval.xml
 %{_mandir}/man8/*
 %{_bindir}/*
 
 
 %changelog
+* Thu Jul 15 2010 Peter Vrabec <pvrabec@redhat.com> 0.6.0-1
+- upgrade
+
 * Thu Jul 01 2010 Peter Vrabec <pvrabec@redhat.com> 0.5.12-1
 - upgrade
 

sources

@@ -1 +1 @@
-ad30eabdfac37b74a41f46547d4cdbc7  openscap-0.5.12.tar.gz
+b810669fb820d051f17f004d5f79b505  openscap-0.6.0.tar.gz