This commit is contained in:
Peter Vrabec 2011-07-26 14:15:47 +02:00
parent b666ef1cdb
commit 1fda365ded
3 changed files with 28 additions and 8 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ openscap-0.6.0.tar.gz
/openscap-0.7.1.tar.gz /openscap-0.7.1.tar.gz
/openscap-0.7.2.tar.gz /openscap-0.7.2.tar.gz
/openscap-0.7.3.tar.gz /openscap-0.7.3.tar.gz
/openscap-0.7.4.tar.gz

View File

@ -2,19 +2,21 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: openscap Name: openscap
Version: 0.7.3 Version: 0.7.4
Release: 3%{?dist} Release: 1%{?dist}
Summary: Set of open source libraries enabling integration of the SCAP line of standards Summary: Set of open source libraries enabling integration of the SCAP line of standards
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
URL: http://www.open-scap.org/ URL: http://www.open-scap.org/
Source0: http://www.open-scap.org/download/%{name}-%{version}.tar.gz Source0: http://www.open-scap.org/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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: rpm-devel
BuildRequires: libgcrypt-devel BuildRequires: libgcrypt-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel
BuildRequires: libselinux-devel
BuildRequires: libblkid-devel
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
@ -82,7 +84,6 @@ Summary: SCAP probes
Group: Applications/System Group: Applications/System
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: libblkid-devel
#BuildRequires: opendbx - for sql #BuildRequires: opendbx - for sql
%description extra-probes %description extra-probes
@ -94,7 +95,17 @@ commonly used and require additional dependencies.
%setup -q %setup -q
%build %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 %configure
make %{?_smp_mflags} make %{?_smp_mflags}
# Remove shebang from bash-completion script # Remove shebang from bash-completion script
sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap
@ -146,23 +157,30 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libexecdir}/openscap/probe_dnscache
%{_libexecdir}/openscap/probe_environmentvariable
%{_libexecdir}/openscap/probe_environmentvariable58
%{_libexecdir}/openscap/probe_family %{_libexecdir}/openscap/probe_family
%{_libexecdir}/openscap/probe_file %{_libexecdir}/openscap/probe_file
%{_libexecdir}/openscap/probe_filehash %{_libexecdir}/openscap/probe_filehash
%{_libexecdir}/openscap/probe_filehash58
%{_libexecdir}/openscap/probe_inetlisteningservers %{_libexecdir}/openscap/probe_inetlisteningservers
%{_libexecdir}/openscap/probe_interface %{_libexecdir}/openscap/probe_interface
%{_libexecdir}/openscap/probe_partition
%{_libexecdir}/openscap/probe_password %{_libexecdir}/openscap/probe_password
%{_libexecdir}/openscap/probe_process %{_libexecdir}/openscap/probe_process
%{_libexecdir}/openscap/probe_rpminfo %{_libexecdir}/openscap/probe_rpminfo
%{_libexecdir}/openscap/probe_runlevel %{_libexecdir}/openscap/probe_runlevel
%{_libexecdir}/openscap/probe_selinuxboolean
%{_libexecdir}/openscap/probe_shadow %{_libexecdir}/openscap/probe_shadow
%{_libexecdir}/openscap/probe_sysctl
%{_libexecdir}/openscap/probe_system_info %{_libexecdir}/openscap/probe_system_info
%{_libexecdir}/openscap/probe_textfilecontent %{_libexecdir}/openscap/probe_textfilecontent
%{_libexecdir}/openscap/probe_textfilecontent54 %{_libexecdir}/openscap/probe_textfilecontent54
%{_libexecdir}/openscap/probe_uname %{_libexecdir}/openscap/probe_uname
%{_libexecdir}/openscap/probe_variable
%{_libexecdir}/openscap/probe_xinetd %{_libexecdir}/openscap/probe_xinetd
%{_libexecdir}/openscap/probe_xmlfilecontent %{_libexecdir}/openscap/probe_xmlfilecontent
%{_libexecdir}/openscap/probe_sysctl
%dir %{_datadir}/openscap %dir %{_datadir}/openscap
%dir %{_datadir}/openscap/schemas %dir %{_datadir}/openscap/schemas
%dir %{_datadir}/openscap/xsl %dir %{_datadir}/openscap/xsl
@ -203,10 +221,11 @@ fi
%files extra-probes %files extra-probes
%{_libexecdir}/openscap/probe_ldap57 %{_libexecdir}/openscap/probe_ldap57
%{_libexecdir}/openscap/probe_dnscache
%{_libexecdir}/openscap/probe_partition
%changelog %changelog
* Mon Jul 25 2011 Peter Vrabec <pvrabec@redhat.com> 0.7.4-1
- upgrade
* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 0.7.3-3 * Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 0.7.3-3
- Perl mass rebuild - Perl mass rebuild

View File

@ -1 +1 @@
ed0f0d9604a57bebf0c36534d595c9ab openscap-0.7.3.tar.gz 7bd74ac9358e5ec3f858d3a082e9eb41 openscap-0.7.4.tar.gz