As agreed in:
https://lists.fedorahosted.org/pipermail/scap-security-guide/2014-February/005010.html
the datastream output format files have been included also into RHEL-6 and
RHEL-7 RPM packages.
The version of EPEL-6 package has been bumped to 0.1-16 and corresponding build
succeeded:
http://koji.fedoraproject.org/koji/buildinfo?buildID=499782
(will shortly schedule new scap-security-guide EPEL-6 package bugfix and
enhancement update)
Above patch covers the necessary changes.
Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
From 98520f5d536a7067df31e4c0dfdc426661571dce Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <[email protected]>
Date: Fri, 21 Feb 2014 15:25:46 +0100
Subject: [PATCH] [RHEL] Include datastream files into RHEL6 and RHEL7 RPM
packages too [RHEL] Bump version to 0.1-16
Signed-off-by: Jan Lieskovsky <[email protected]>
---
RHEL/6/Makefile | 1 +
RHEL/7/Makefile | 1 +
scap-security-guide.spec | 6 +++++-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/RHEL/6/Makefile b/RHEL/6/Makefile
index 2835c94..40ac4ed 100644
--- a/RHEL/6/Makefile
+++ b/RHEL/6/Makefile
@@ -131,6 +131,7 @@ dist: tables guide content
cp $(OUT)/$(ID)-rhel6-oval.xml $(DIST)/content
cp $(OUT)/$(ID)-rhel6-cpe-dictionary.xml $(DIST)/content
cp $(OUT)/$(ID)-rhel6-cpe-oval.xml $(DIST)/content
+ cp $(OUT)/$(ID)-rhel6-ds.xml $(DIST)/content
clean:
rm -f $(OUT)/*.xml $(OUT)/*.html $(OUT)/*.xhtml $(OUT)/*.pdf $(OUT)/*.spec $(OUT)/*.tar $(OUT)/*.gz $(OUT)/*.ini $(OUT)/*.csv
diff --git a/RHEL/7/Makefile b/RHEL/7/Makefile
index d92a003..01aa717 100644
--- a/RHEL/7/Makefile
+++ b/RHEL/7/Makefile
@@ -132,6 +132,7 @@ dist: tables guide content
cp $(OUT)/$(ID)-rhel7-oval.xml $(DIST)/content
cp $(OUT)/$(ID)-rhel7-cpe-dictionary.xml $(DIST)/content
cp $(OUT)/$(ID)-rhel7-cpe-oval.xml $(DIST)/content
+ cp $(OUT)/$(ID)-rhel7-ds.xml $(DIST)/content
clean:
rm -f $(OUT)/*.xml $(OUT)/*.html $(OUT)/*.xhtml $(OUT)/*.pdf $(OUT)/*.spec $(OUT)/*.tar $(OUT)/*.gz $(OUT)/*.ini $(OUT)/*.csv
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 228589e..786a8eb 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,4 +1,4 @@
-%global redhatssgrelease 16.rc3
+%global redhatssgrelease 16
Name: scap-security-guide
Version: 0.1
@@ -53,6 +53,10 @@ cp -a RHEL/6/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
%doc RHEL/6/LICENSE RHEL/6/output/rhel6-guide.html RHEL/6/output/table-rhel6-cces.html RHEL/6/output/table-rhel6-nistrefs-common.html RHEL/6/output/table-rhel6-nistrefs.html RHEL/6/output/table-rhel6-srgmap-flat.html RHEL/6/output/table-rhel6-srgmap-flat.xhtml RHEL/6/output/table-rhel6-srgmap.html RHEL/6/output/table-rhel6-stig.html JBossEAP5/docs/JBossEAP5_Guide.html
%changelog
+* Fri Feb 21 2014 Jan iankko Lieskovsky <[email protected]> 0.1-16
+- Include datastream files into RHEL6 and RHEL7 RPM packages too
+- Bump version
+
* Thu Jan 23 2014 Shawn Wells <[email protected]> 0.1-16.rc3
+ Added to RHEL7 content pool
- OVAL for sshd_set_idle_timeout
--
1.8.3.1
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
