[openscap/f15] upgrade
Peter Vrabec
pvrabec at fedoraproject.org
Tue Jul 26 12:25:26 UTC 2011
commit a6e1dbb143aa4aa93843a99b3c961e6cfe147072
Author: Peter Vrabec <pvrabec at redhat.com>
Date: Tue Jul 26 14:25:04 2011 +0200
upgrade
.gitignore | 1 +
openscap.spec | 31 +++++++++++++++++++++++++------
sources | 2 +-
3 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fc2d3e..045627f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ openscap-0.6.0.tar.gz
/openscap-0.7.1.tar.gz
/openscap-0.7.2.tar.gz
/openscap-0.7.3.tar.gz
+/openscap-0.7.4.tar.gz
diff --git a/openscap.spec b/openscap.spec
index 9dab8ea..d50569f 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.3
+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
@@ -82,7 +84,6 @@ Summary: SCAP probes
Group: Applications/System
Requires: %{name} = %{version}-%{release}
BuildRequires: openldap-devel
-BuildRequires: libblkid-devel
#BuildRequires: opendbx - for sql
%description extra-probes
@@ -94,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
@@ -146,23 +157,30 @@ 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
-%{_libexecdir}/openscap/probe_sysctl
%dir %{_datadir}/openscap
%dir %{_datadir}/openscap/schemas
%dir %{_datadir}/openscap/xsl
@@ -203,10 +221,11 @@ fi
%files extra-probes
%{_libexecdir}/openscap/probe_ldap57
-%{_libexecdir}/openscap/probe_dnscache
-%{_libexecdir}/openscap/probe_partition
%changelog
+* Mon Jul 25 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.4-1
+- upgrade
+
* Fri Jun 24 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.3-1
- upgrade
diff --git a/sources b/sources
index 939e169..9efca34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed0f0d9604a57bebf0c36534d595c9ab openscap-0.7.3.tar.gz
+7bd74ac9358e5ec3f858d3a082e9eb41 openscap-0.7.4.tar.gz
More information about the scm-commits
mailing list