[openscap/f14] upgrade

[Peter Vrabec]

commit b76e8515629d7c01dd139d67b65734d51fe0612a
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Tue Jul 26 14:35:06 2011 +0200

    upgrade

 .gitignore    |    1 +
 openscap.spec |   31 +++++++++++++++++++++++++------
 sources       |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d808cb..68e7132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ openscap-0.6.2.tar.gz
 /openscap-0.7.0.tar.gz
 /openscap-0.7.1.tar.gz
 /openscap-0.7.2.tar.gz
+/openscap-0.7.4.tar.gz
diff --git a/openscap.spec b/openscap.spec
index d090628..c84d79e 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.2
+Version:        0.7.4
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -10,11 +10,13 @@ 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 libxslt-devel
+BuildRequires:  swig libxml2-devel libxslt-devel perl-XML-Parser
 BuildRequires:  rpm-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pcre-devel
 BuildRequires:  libacl-devel
+BuildRequires:  libselinux-devel
+BuildRequires:  libblkid-devel
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -63,7 +65,6 @@ Group:          Applications/System
 Requires:       %{name} = %{version}-%{release}
 Requires(post):  chkconfig
 Requires(preun): chkconfig initscripts
-BuildRequires:   libcurl-devel
 
 %description    utils
 The %{name}-utils package contains various utilities based on %{name} library.
@@ -83,7 +84,6 @@ 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
@@ -95,7 +95,17 @@ commonly used and require additional dependencies.
 %setup -q
 
 %build
+%ifarch sparc64
+#sparc64 need big PIE
+export CFLAGS="$RPM_OPT_FLAGS -fPIE"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%else
+export CFLAGS="$RPM_OPT_FLAGS -fpie"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
+%endif
+
 %configure
+
 make %{?_smp_mflags}
 # Remove shebang from bash-completion script
 sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap
@@ -147,20 +157,28 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
+%{_libexecdir}/openscap/probe_dnscache
+%{_libexecdir}/openscap/probe_environmentvariable
+%{_libexecdir}/openscap/probe_environmentvariable58
 %{_libexecdir}/openscap/probe_family
 %{_libexecdir}/openscap/probe_file
 %{_libexecdir}/openscap/probe_filehash
+%{_libexecdir}/openscap/probe_filehash58
 %{_libexecdir}/openscap/probe_inetlisteningservers
 %{_libexecdir}/openscap/probe_interface
+%{_libexecdir}/openscap/probe_partition
 %{_libexecdir}/openscap/probe_password
 %{_libexecdir}/openscap/probe_process
 %{_libexecdir}/openscap/probe_rpminfo
 %{_libexecdir}/openscap/probe_runlevel
+%{_libexecdir}/openscap/probe_selinuxboolean
 %{_libexecdir}/openscap/probe_shadow
+%{_libexecdir}/openscap/probe_sysctl
 %{_libexecdir}/openscap/probe_system_info
 %{_libexecdir}/openscap/probe_textfilecontent
 %{_libexecdir}/openscap/probe_textfilecontent54
 %{_libexecdir}/openscap/probe_uname
+%{_libexecdir}/openscap/probe_variable
 %{_libexecdir}/openscap/probe_xinetd
 %{_libexecdir}/openscap/probe_xmlfilecontent
 %dir %{_datadir}/openscap
@@ -198,15 +216,16 @@ fi
 %defattr(-,root,root,-)
 %{_datadir}/openscap/scap-oval.xml
 %{_datadir}/openscap/scap-xccdf.xml
-%{_datadir}/openscap/scap-fedora13-oval.xml
 %{_datadir}/openscap/scap-fedora14-oval.xml
 %{_datadir}/openscap/scap-fedora14-xccdf.xml
 
 %files extra-probes
 %{_libexecdir}/openscap/probe_ldap57
-%{_libexecdir}/openscap/probe_dnscache
 
 %changelog
+* Mon Jul 25 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.4-1
+- upgrade
+
 * Wed Apr 20 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.2-1
 - upgrade
 
diff --git a/sources b/sources
index cb62648..9efca34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b64c4d2c9838dcba1c8cf4e3aa7a4190  openscap-0.7.2.tar.gz
+7bd74ac9358e5ec3f858d3a082e9eb41  openscap-0.7.4.tar.gz