[openscap/f13/master] upgrade

[Peter Vrabec]

commit 51743c4ae22f6c3097499fdb4aaad2cbbbd4c698
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Fri Aug 27 16:32:11 2010 +0200

    upgrade

 .gitignore    |    1 +
 openscap.spec |   26 ++++++++++++++++++++++++--
 sources       |    2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 060dbea..97159b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 openscap-0.6.0.tar.gz
+openscap-0.6.2.tar.gz
diff --git a/openscap.spec b/openscap.spec
index 94de6ba..607876f 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           openscap
-Version:        0.6.0
+Version:        0.6.2
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@ License:        LGPLv2+
 URL:            http://www.open-scap.org/
 Source0:        http://www.open-scap.org/download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  swig libxml2-devel
+BuildRequires:  swig libxml2-devel libxslt-devel
 BuildRequires:  rpm-devel
 BuildRequires:	libgcrypt-devel
 BuildRequires:	pcre-devel
@@ -69,6 +69,8 @@ The %{name}-utils package contains various utilities based on %{name} library.
 %build
 %configure
 make %{?_smp_mflags}
+# Remove shebang from bash-completion script
+sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +82,14 @@ install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -p -m 755 dist/fedora/oscap-scan.init $RPM_BUILD_ROOT%{_initrddir}/oscap-scan
 install -p -m 644 dist/fedora/oscap-scan.sys  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan
 
+# create symlinks to default content
+ln -s  %{_datadir}/openscap/scap-fedora14-oval.xml %{buildroot}/%{_datadir}/openscap/scap-oval.xml
+ln -s  %{_datadir}/openscap/scap-fedora14-xccdf.xml %{buildroot}/%{_datadir}/openscap/scap-xccdf.xml
+
+# bash-completion script
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
+install -pm 644 dist/bash_completion.d/oscap $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/oscap
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %clean
@@ -106,6 +116,7 @@ fi
 %{_libdir}/*.so.*
 %{_libexecdir}/*
 %{_datadir}/openscap/schemas/*
+%{_datadir}/openscap/xsl/*
 
 %files python
 %defattr(-,root,root,-)
@@ -127,13 +138,24 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan
 %{_initrddir}/oscap-scan
 %{_datadir}/openscap/oscap-scan.cron
+%{_datadir}/openscap/scap-oval.xml
 %{_datadir}/openscap/scap-fedora12-oval.xml
 %{_datadir}/openscap/scap-fedora13-oval.xml
+%{_datadir}/openscap/scap-fedora14-oval.xml
+%{_datadir}/openscap/scap-xccdf.xml
+%{_datadir}/openscap/scap-fedora14-xccdf.xml
 %{_mandir}/man8/*
 %{_bindir}/*
+%{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Fri Aug 27 2010 Peter Vrabec <pvrabec at redhat.com> 0.6.2-1
+- upgrade
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
 * Thu Jul 15 2010 Peter Vrabec <pvrabec at redhat.com> 0.6.0-1
 - upgrade
 
diff --git a/sources b/sources
index 7d767bd..237f2fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b810669fb820d051f17f004d5f79b505  openscap-0.6.0.tar.gz
+7cf91a6fee29c9a7cb16692f445c16e2  openscap-0.6.2.tar.gz