[RHEL] Include datastream files into RHEL6 and RHEL7 RPM packages too

[RHEL] Bump version to 0.1-16

Author: Jan Lieskovsky

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

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

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