[openscap] Extract oscap tool to a separate package (rhbz#1115116)

[Šimon Lukašík]

commit e81c8b54354a9935ce118769b97011de55c8ec78
Author: Simon Lukasik <slukasik at redhat.com>
Date:   Tue Jul 1 17:23:57 2014 +0200

    Extract oscap tool to a separate package (rhbz#1115116)

 openscap.spec |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/openscap.spec b/openscap.spec
index c2903e2..f2fa89f 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -6,7 +6,7 @@ restorecon -R /usr/bin/oscap /usr/libexec/openscap; \
 
 Name:           openscap
 Version:        1.0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -65,19 +65,30 @@ The %{name}-perl package contains the bindings so that %{name}
 libraries can be used by perl.
 
 
-%package        utils
-Summary:        Openscap utilities
+%package        scanner
+Summary:        OpenSCAP Scanner Tool (oscap)
 Group:          Applications/System
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       libcurl >= 7.12.0
-Requires:       rpmdevtools rpm-build
 BuildRequires:  libcurl-devel >= 7.12.0
 
-%description    utils
-The %{name}-utils package contains oscap command-line tool. The oscap
+%description    scanner
+The %{name}-scanner package contains oscap command-line tool. The oscap
 is configuration and vulnerability scanner, capable of performing
 compliance checking using SCAP content.
 
+%package        utils
+Summary:        OpenSCAP Utilities
+Group:          Applications/System
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       rpmdevtools rpm-build
+Requires:       %{name}-scanner%{?_isa} = %{version}-%{release}
+
+%description    utils
+The %{name}-utils package contains command-line tools build on top
+of OpenSCAP library. Historically, openscap-utils included oscap
+tool which is now separated to %{name}-scanner sub-package.
+
 %package        content-sectool
 Summary:        Sectool content
 Group:          Applications/System
@@ -277,12 +288,18 @@ exit 0
 %{_libdir}/libopenscap_sce.so
 %{_includedir}/openscap/sce_engine_api.h
 
+%files scanner
+%{_mandir}/man8/oscap.8.gz
+%{_bindir}/oscap
+%{_sysconfdir}/bash_completion.d
+
 %files utils
 %defattr(-,root,root,-)
 %doc docs/oscap-scan.cron
 %{_mandir}/man8/*
+%exclude %{_mandir}/man8/oscap.8.gz
 %{_bindir}/*
-%{_sysconfdir}/bash_completion.d
+%exclude %{_bindir}/oscap
 
 %files content-sectool
 %defattr(-,root,root,-)
@@ -305,6 +322,9 @@ exit 0
 # %{_mandir}/man8/openscap_selinux.8.*
 
 %changelog
+* Tue Jul 01 2014 Šimon Lukašík <slukasik at redhat.com> - 1.0.9-2
+- Extract oscap tool to a separate package (rhbz#1115116)
+
 * Wed Jun 25 2014 Martin Preisler <mpreisle at redhat.com> - 1.0.9-1
 - upgrade