From 86c4750e5f32071cf60cdc7053661c0c9e7f86bf Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@redhat.com>
Date: Wed, 20 Apr 2011 14:03:34 +0200
Subject: [PATCH] upgrade

---
 .gitignore    |  1 +
 openscap.spec | 52 ++++++++++++++++++++++++++++++++++++++++++++++-----
 sources       |  2 +-
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b20c8c2..6c52395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ openscap-0.6.0.tar.gz
 /openscap-0.6.8.tar.gz
 /openscap-0.7.0.tar.gz
 /openscap-0.7.1.tar.gz
+/openscap-0.7.2.tar.gz
diff --git a/openscap.spec b/openscap.spec
index 2cdb1fe..d090628 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.7.1
+Version:        0.7.2
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRequires:  swig libxml2-devel libxslt-devel
 BuildRequires:  rpm-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pcre-devel
+BuildRequires:  libacl-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -55,6 +56,7 @@ BuildRequires:  perl-devel
 The %{name}-perl package contains the bindings so that %{name}
 libraries can be used by perl.
 
+
 %package        utils
 Summary:        Openscap utilities
 Group:          Applications/System
@@ -66,13 +68,28 @@ BuildRequires:   libcurl-devel
 %description    utils
 The %{name}-utils package contains various utilities based on %{name} library.
 
+
 %package        content
 Summary:        SCAP content
 Group:          Applications/System
 Requires:       %{name} = %{version}-%{release}
 
 %description    content
-SCAP content for RHEL and Fedora delivered by Open-SCAP project.
+SCAP content for Fedora delivered by Open-SCAP project.
+
+
+%package        extra-probes
+Summary:        SCAP probes
+Group:          Applications/System
+Requires:       %{name} = %{version}-%{release}
+BuildRequires:  openldap-devel
+BuildRequires:  c-ares-devel >= 1.7.0
+#BuildRequires:  opendbx - for sql
+
+%description    extra-probes
+The %{name}-extra-probes package contains additional probes that are not
+commonly used and require additional dependencies.
+
 
 %prep
 %setup -q
@@ -98,6 +115,10 @@ install -p -m 644 dist/fedora/oscap-scan.sys  $RPM_BUILD_ROOT%{_sysconfdir}/sysc
 ln -s  %{_datadir}/openscap/scap-fedora14-oval.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-oval.xml
 ln -s  %{_datadir}/openscap/scap-fedora14-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml
 
+# remove content for another OS
+rm $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-rhel6-oval.xml
+rm $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-rhel6-xccdf.xml
+
 # bash-completion script
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d
 install -pm 644 dist/bash_completion.d/oscap $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/oscap
@@ -126,7 +147,22 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
-%{_libexecdir}/*
+%{_libexecdir}/openscap/probe_family
+%{_libexecdir}/openscap/probe_file
+%{_libexecdir}/openscap/probe_filehash
+%{_libexecdir}/openscap/probe_inetlisteningservers
+%{_libexecdir}/openscap/probe_interface
+%{_libexecdir}/openscap/probe_password
+%{_libexecdir}/openscap/probe_process
+%{_libexecdir}/openscap/probe_rpminfo
+%{_libexecdir}/openscap/probe_runlevel
+%{_libexecdir}/openscap/probe_shadow
+%{_libexecdir}/openscap/probe_system_info
+%{_libexecdir}/openscap/probe_textfilecontent
+%{_libexecdir}/openscap/probe_textfilecontent54
+%{_libexecdir}/openscap/probe_uname
+%{_libexecdir}/openscap/probe_xinetd
+%{_libexecdir}/openscap/probe_xmlfilecontent
 %dir %{_datadir}/openscap
 %dir %{_datadir}/openscap/schemas
 %dir %{_datadir}/openscap/xsl
@@ -161,13 +197,19 @@ fi
 %files content
 %defattr(-,root,root,-)
 %{_datadir}/openscap/scap-oval.xml
-%{_datadir}/openscap/scap-fedora12-oval.xml
+%{_datadir}/openscap/scap-xccdf.xml
 %{_datadir}/openscap/scap-fedora13-oval.xml
 %{_datadir}/openscap/scap-fedora14-oval.xml
-%{_datadir}/openscap/scap-xccdf.xml
 %{_datadir}/openscap/scap-fedora14-xccdf.xml
 
+%files extra-probes
+%{_libexecdir}/openscap/probe_ldap57
+%{_libexecdir}/openscap/probe_dnscache
+
 %changelog
+* Wed Apr 20 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.2-1
+- upgrade
+
 * Fri Mar 11 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.1-1
 - upgrade
 
diff --git a/sources b/sources
index 3c6eba4..cb62648 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-45f856c62855912416411d8d1593fc8c  openscap-0.7.1.tar.gz
+b64c4d2c9838dcba1c8cf4e3aa7a4190  openscap-0.7.2.tar.gz