[scap-security-guide/f20] Drop -compat package, provide openscap-content directly (RH BZ#1040335#c14).
Jan Lieskovsky
jlieskov at fedoraproject.org
Mon Jan 6 13:54:30 UTC 2014
commit 3f041cdbd393fdb0d8f1c3d2421a4e2b49b9610c
Author: Jan Lieskovsky <jlieskov at redhat.com>
Date: Mon Jan 6 14:53:58 2014 +0100
Drop -compat package, provide openscap-content directly (RH BZ#1040335#c14).
scap-security-guide.spec | 19 +++++--------------
sources | 2 +-
2 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 0fd2e21..b6edf11 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -9,7 +9,7 @@
Name: scap-security-guide
Version: 0.1.%{fedorassgversion}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Security guidance and baselines in SCAP formats
Group: Applications/System
License: Public Domain
@@ -19,6 +19,7 @@ BuildArch: noarch
BuildRequires: libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml
Requires: xml-common, openscap-utils >= 0.9.1
Obsoletes: openscap-content < 0:0.9.13
+Provides: openscap-content
%description
The scap-security-guide project provides a guide for configuration of the
@@ -32,18 +33,6 @@ scap-workbench GUI tool from scap-workbench package to verify that the system
conforms to provided guideline. Refer to scap-security-guide(8) manual page for
further information.
-%package compat
-Summary: Extra package to ensure compatibility with firstaidkit-plugin-openscap
-License: Public Domain
-BuildArch: noarch
-Requires: xml-common, openscap-utils >= 0.9.1
-Provides: openscap-content, firstaidkit-plugin-openscap
-
-%description compat
-This package corrects Provides requirements needed to maintain
-backward-compatibility with openscap-content and firstaidkit-plugin-openscap
-packages.
-
%prep
%setup -q -n %{name}-%{version}
@@ -65,9 +54,11 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
%doc Fedora/LICENSE Fedora/output/ssg-fedora-guide.html
-%files compat
%changelog
+* Mon Jan 06 2014 Jan iankko Lieskovsky <jlieskov at redhat.com> 0.1.4-2
+- Drop -compat package, provide openscap-content directly (RH BZ#1040335#c14)
+
* Fri Dec 20 2013 Jan iankko Lieskovsky <jlieskov at redhat.com> 0.1.4-1
- Fix remediation for sshd set keepalive (ClientAliveCountMax) and move
it to /shared
diff --git a/sources b/sources
index 873584b..c035506 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-265b20ec271bc0eb31112d2ce2d07ea0 scap-security-guide-0.1.4.tar.gz
+e82783de1c9d656b3a5e97cf747deb04 scap-security-guide-0.1.4.tar.gz
More information about the scm-commits
mailing list