[openscap/f14/master] upgrade

[Peter Vrabec]

commit cf44b7c2a3b4fbdb208197c0cbc30b759f491250
Author: Peter Vrabec <pvrabec at redhat.com>
Date:   Fri Mar 11 16:44:15 2011 +0100

    upgrade

 .gitignore    |    1 +
 openscap.spec |   26 ++++++++++++++++++--------
 sources       |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1181f8..80722f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ openscap-0.6.2.tar.gz
 /openscap-0.6.5.tar.gz
 /openscap-0.6.8.tar.gz
 /openscap-0.7.0.tar.gz
+/openscap-0.7.1.tar.gz
diff --git a/openscap.spec b/openscap.spec
index ba55698..2cdb1fe 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.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
@@ -28,6 +28,7 @@ Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
+Requires:       pkgconfig
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -47,6 +48,7 @@ libraries can be used by python.
 Summary:        Perl bindings for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires:  perl-devel
 
 %description    perl
@@ -85,7 +87,7 @@ sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT
 
 install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -93,11 +95,11 @@ install -p -m 755 dist/fedora/oscap-scan.init $RPM_BUILD_ROOT%{_initrddir}/oscap
 install -p -m 644 dist/fedora/oscap-scan.sys  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan
 
 # create symlinks to default content
-ln -s  %{_datadir}/openscap/scap-fedora14-oval.xml %{buildroot}/%{_datadir}/openscap/scap-oval.xml
-ln -s  %{_datadir}/openscap/scap-fedora14-xccdf.xml %{buildroot}/%{_datadir}/openscap/scap-xccdf.xml
+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
 
 # bash-completion script
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
+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
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -125,6 +127,9 @@ fi
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
 %{_libexecdir}/*
+%dir %{_datadir}/openscap
+%dir %{_datadir}/openscap/schemas
+%dir %{_datadir}/openscap/xsl
 %{_datadir}/openscap/schemas/*
 %{_datadir}/openscap/xsl/*
 
@@ -139,7 +144,7 @@ fi
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/{html,latex,examples}/
+%doc docs/{html,examples}/
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -147,8 +152,8 @@ fi
 %files utils
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan
+%doc docs/oscap-scan.cron
 %{_initrddir}/oscap-scan
-%{_datadir}/openscap/oscap-scan.cron
 %{_mandir}/man8/*
 %{_bindir}/*
 %{_sysconfdir}/bash_completion.d
@@ -162,11 +167,16 @@ fi
 %{_datadir}/openscap/scap-xccdf.xml
 %{_datadir}/openscap/scap-fedora14-xccdf.xml
 
-
 %changelog
+* Fri Mar 11 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.1-1
+- upgrade
+
 * Thu Feb 10 2011 Peter Vrabec <pvrabec at redhat.com> 0.7.0-1
 - upgrade
 
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jan 31 2011 Peter Vrabec <pvrabec at redhat.com> 0.6.8-1
 - upgrade
 
diff --git a/sources b/sources
index c5abc9b..3c6eba4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e556604cfeadc690b32d6dc268812b80  openscap-0.7.0.tar.gz
+45f856c62855912416411d8d1593fc8c  openscap-0.7.1.tar.gz