diff --git a/.cvsignore b/.cvsignore index 9a747ce..5db51ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -openscap-0.5.11.tar.gz +openscap-0.5.12.tar.gz diff --git a/openscap-0.5.12-config.patch b/openscap-0.5.12-config.patch new file mode 100644 index 0000000..b984c5b --- /dev/null +++ b/openscap-0.5.12-config.patch @@ -0,0 +1,23 @@ +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" + diff --git a/openscap-0.5.8-config.patch b/openscap-0.5.8-config.patch deleted file mode 100644 index 6d5d66c..0000000 --- a/openscap-0.5.8-config.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up openscap-0.5.8/dist/fedora/oscap-scan.cron.config openscap-0.5.8/dist/fedora/oscap-scan.cron ---- openscap-0.5.8/dist/fedora/oscap-scan.cron.config 2010-03-24 15:57:03.646108236 +0100 -+++ openscap-0.5.8/dist/fedora/oscap-scan.cron 2010-03-24 15:57:26.986117969 +0100 -@@ -5,7 +5,7 @@ - # sent to root mail. Please configure oscap-scan options before you use it! - ########## - --#OPTIONS="/usr/share/openscap/scap-fedora12-oval.xml" -+OPTIONS="/usr/share/openscap/scap-fedora13-oval.xml" - PROG="/usr/bin/oscap-scan" - if [ x"$OPTIONS" == "x" ] - then -diff -up openscap-0.5.8/dist/fedora/oscap-scan.sys.config openscap-0.5.8/dist/fedora/oscap-scan.sys ---- openscap-0.5.8/dist/fedora/oscap-scan.sys.config 2010-03-24 15:57:44.733108831 +0100 -+++ openscap-0.5.8/dist/fedora/oscap-scan.sys 2010-03-24 15:57:56.122129104 +0100 -@@ -1,4 +1,4 @@ - - #oscap-scan command line options: --#OPTIONS="-q --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora12-oval.xml" -+OPTIONS="-q --result-file /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora13-oval.xml" - diff --git a/openscap.spec b/openscap.spec index 4ba5548..b40e758 100644 --- a/openscap.spec +++ b/openscap.spec @@ -2,14 +2,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: openscap -Version: 0.5.11 +Version: 0.5.12 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.8-config.patch +Patch1: openscap-0.5.12-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: swig libxml2-devel BuildRequires: rpm-devel @@ -133,6 +133,9 @@ fi %changelog +* Thu Jul 01 2010 Peter Vrabec 0.5.12-1 +- upgrade + * Wed May 26 2010 Peter Vrabec 0.5.11-1 - upgrade diff --git a/sources b/sources index 5eb9430..ba1d4ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cadf4938f1f646358216811a6909590 openscap-0.5.11.tar.gz +ad30eabdfac37b74a41f46547d4cdbc7 openscap-0.5.12.tar.gz