From 3c42c661b4f12d57fda35c3506bde1140a09a02f Mon Sep 17 00:00:00 2001 From: Jan Lieskovsky <jlieskov@redhat.com> Date: Mon, 26 May 2014 16:26:08 +0200 Subject: [PATCH 2/2] [RHEL/6, RHEL/7, Fedora] Drop Requires on openscap-utils. Add a note into manual pages regarding that. Signed-off-by: Jan Lieskovsky <jlieskov@redhat.com> --- Fedora/input/auxiliary/scap-security-guide.8 | 7 +++++++ Fedora/scap-security-guide.spec | 2 +- RHEL/6/input/auxiliary/scap-security-guide.8 | 7 +++++++ RHEL/7/input/auxiliary/scap-security-guide.8 | 7 +++++++ scap-security-guide.spec | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Fedora/input/auxiliary/scap-security-guide.8 b/Fedora/input/auxiliary/scap-security-guide.8 index 7758f37..50235d9 100644 --- a/Fedora/input/auxiliary/scap-security-guide.8 +++ b/Fedora/input/auxiliary/scap-security-guide.8 @@ -33,6 +33,13 @@ scanning of general-purpose Fedora systems. .SH EXAMPLES + +.B "NOTE: " +Example below assumes the openscap-utils package is installed on the system. +If that's not the case to install the openscap-utils package run the +.I yum install openscap-utils +command as the root user. + To scan your system utilizing the OpenSCAP utility against the common profile, run: diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec index c5a8911..adf92a5 100644 --- a/Fedora/scap-security-guide.spec +++ b/Fedora/scap-security-guide.spec @@ -23,7 +23,7 @@ Source0: http://fedorapeople.org/~jlieskov/%{name}-%{version}.tar.gz Source1: http://repos.ssgproject.org/sources/%{name}-%{rhelssgversion}.tar.gz BuildArch: noarch BuildRequires: libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml -Requires: xml-common, openscap-utils >= 0.9.1 +Requires: xml-common Obsoletes: openscap-content < 0:0.9.13 Provides: openscap-content diff --git a/RHEL/6/input/auxiliary/scap-security-guide.8 b/RHEL/6/input/auxiliary/scap-security-guide.8 index 44ae1ab..e676d35 100644 --- a/RHEL/6/input/auxiliary/scap-security-guide.8 +++ b/RHEL/6/input/auxiliary/scap-security-guide.8 @@ -68,6 +68,13 @@ webpage at http://usgcb.nist.gov/usgcb_content.html. .SH EXAMPLES + +.B "NOTE: " +Example below assumes the openscap-utils package is installed on the system. +If that's not the case to install the openscap-utils package run the +.I yum install openscap-utils +command as the root user. + To scan your system utilizing the OpenSCAP utility against the stig-rhel6-server-upstream profile: diff --git a/RHEL/7/input/auxiliary/scap-security-guide.8 b/RHEL/7/input/auxiliary/scap-security-guide.8 index 97c4aec..7625fdd 100644 --- a/RHEL/7/input/auxiliary/scap-security-guide.8 +++ b/RHEL/7/input/auxiliary/scap-security-guide.8 @@ -58,6 +58,13 @@ webpage at http://usgcb.nist.gov/usgcb_content.html. .SH EXAMPLES + +.B "NOTE: " +Example below assumes the openscap-utils package is installed on the system. +If that's not the case to install the openscap-utils package run the +.I yum install openscap-utils +command as the root user. + To scan your system utilizing the OpenSCAP utility against the stig-rhel6-server profile: diff --git a/scap-security-guide.spec b/scap-security-guide.spec index fad1c6f..c23be44 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -15,7 +15,7 @@ Source0: http://repos.ssgproject.org/sources/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml -Requires: xml-common, openscap-utils >= 0.9.1 +Requires: xml-common %description The scap-security-guide project provides a guide for configuration of the-- 1.8.3.1