Based on Shawn's datastream format enhancements from
yesterday include the generated ssg-fedora-ds.xml datastream
file also into the final RPM package, so users could scan
remote Fedora systems without the need to perform the explicit
conversion by themselves.

Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
From 7f6fbc54dc0a813afc9a1f269ca4823910579d96 Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <[email protected]>
Date: Thu, 20 Feb 2014 16:34:08 +0100
Subject: [PATCH] [Fedora] Include datastream file (for remote system scans)
 into RPM package too

Signed-off-by: Jan Lieskovsky <[email protected]>
---
 Fedora/Makefile                 | 1 +
 Fedora/scap-security-guide.spec | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Fedora/Makefile b/Fedora/Makefile
index 0cc965e..8705d6f 100644
--- a/Fedora/Makefile
+++ b/Fedora/Makefile
@@ -62,6 +62,7 @@ dist: guide content
 	mkdir -p $(DIST)/content
 	cp $(OUT)/$(ID)-$(PROD)-xccdf.xml $(DIST)/content
 	cp $(OUT)/$(ID)-$(PROD)-oval.xml $(DIST)/content
+	cp $(OUT)/$(ID)-$(PROD)-ds.xml $(DIST)/content
 	cp $(OUT)/$(ID)-$(PROD)-cpe-dictionary.xml $(DIST)/content
 	cp $(OUT)/$(ID)-$(PROD)-cpe-oval.xml $(DIST)/content
 
diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec
index b6edf11..ac1be96 100644
--- a/Fedora/scap-security-guide.spec
+++ b/Fedora/scap-security-guide.spec
@@ -5,11 +5,11 @@
 # file one level up - in the main scap-security-guide directory (instead of
 # this one).
 
-%global	fedorassgversion	4
+%global	fedorassgversion	5.rc1
 
 Name:		scap-security-guide
 Version:	0.1.%{fedorassgversion}
-Release:	2%{?dist}
+Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 Group:		Applications/System
 License:	Public Domain
@@ -56,6 +56,10 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
 
 
 %changelog
+* Thu Feb 20 2014 Jan iankko Lieskovsky <[email protected]> 0.1.5.rc1-1
+- EOL for Fedora 18 support
+- Include datastream file (for remote system scans) into RPM package too
+
 * Mon Jan 06 2014 Jan iankko Lieskovsky <[email protected]> 0.1.4-2
 - Drop -compat package, provide openscap-content directly (RH BZ#1040335#c14)
 
-- 
1.8.3.1

_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide

Reply via email to