diff --git a/.gitignore b/.gitignore index 93f1621..94bce43 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ openscap-0.6.0.tar.gz /openscap-0.6.2.tar.gz /openscap-0.6.3.tar.gz /openscap-0.6.4.tar.gz +/openscap-0.6.5.tar.gz diff --git a/openscap.spec b/openscap.spec index c04c5b7..181e7c0 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.4 +Version: 0.6.5 Release: 1%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries @@ -12,8 +12,8 @@ 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: rpm-devel -BuildRequires: libgcrypt-devel -BuildRequires: pcre-devel +BuildRequires: libgcrypt-devel +BuildRequires: pcre-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -63,6 +63,14 @@ 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. + %prep %setup -q @@ -72,6 +80,7 @@ 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 @@ -132,43 +141,38 @@ fi %doc docs/{html,latex,examples}/ %{_includedir}/* %{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc %files utils %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan %{_initrddir}/oscap-scan %{_datadir}/openscap/oscap-scan.cron +%{_mandir}/man8/* +%{_bindir}/* +%{_sysconfdir}/bash_completion.d + +%files content +%defattr(-,root,root,-) %{_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 * Wed Oct 20 2010 Peter Vrabec 0.6.4-1 - upgrade -* Wed Sep 29 2010 jkeating - 0.6.3-2 -- Rebuilt for gcc bug 634757 - * Tue Sep 14 2010 Peter Vrabec 0.6.3-1 - upgrade * Fri Aug 27 2010 Peter Vrabec 0.6.2-1 - upgrade -* Wed Jul 21 2010 David Malcolm - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu Jul 15 2010 Peter Vrabec 0.6.0-1 -- upgrade - -* Thu Jul 01 2010 Peter Vrabec 0.5.12-1 +* Wed Jul 14 2010 Peter Vrabec 0.6.0-1 - upgrade * Wed May 26 2010 Peter Vrabec 0.5.11-1 @@ -180,10 +184,6 @@ fi * Fri Apr 16 2010 Peter Vrabec 0.5.9-1 - upgrade -* Wed Mar 24 2010 Peter Vrabec 0.5.8-1 -- upgrade -- configure initscipt and cronjob script - * Fri Feb 26 2010 Peter Vrabec 0.5.7-1 - upgrade - new utils package diff --git a/sources b/sources index d97a156..93956ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44be876047283bd7bd4e171668ea3018 openscap-0.6.4.tar.gz +a3ed56c60a18105c0e5c0a297344906a openscap-0.6.5.tar.gz