>From 70a1e509417a9f1c68438e3ddeaea173b28359a0 Mon Sep 17 00:00:00 2001
From: Shawn Wells <[email protected]>
Date: Tue, 5 Feb 2013 14:08:11 -0500
Subject: [PATCH] Patch to include JBoss content in the RPM
[root@rhel6 scap-security-guide]# rpm -e scap-security-guide
[root@rhel6 scap-security-guide]# rpm -ivh
rpmbuild/src/redhat/RPMS/noarch/scap-security-guide-0.1-9.el6.noarch.rpm
Preparing... ########################################### [100%]
1:scap-security-guide ########################################### [100%]
[root@rhel6 scap-security-guide]# ll /usr/share/xml/scap/ssg/content/
total 2536
-rwxr-xr-x. 1 root root 3000 Feb 5 14:04 eap5-cpe-dictionary.xml
-rwxr-xr-x. 1 root root 8347 Feb 5 14:04 eap5-cpe-oval.xml
-rwxr-xr-x. 1 root root 174783 Feb 5 14:04 eap5-ocil.xml
-rwxr-xr-x. 1 root root 64810 Feb 5 14:04 eap5-oval.xml
-rwxr-xr-x. 1 root root 341288 Feb 5 14:04 eap5-xccdf.xml
-rwxr-xr-x. 1 root root 600 Feb 5 14:04 ssg-rhel6-cpe-dictionary.xml
-rwxr-xr-x. 1 root root 3642 Feb 5 14:04 ssg-rhel6-cpe-oval.xml
-rwxr-xr-x. 1 root root 889662 Feb 5 14:04 ssg-rhel6-oval.xml
-rwxr-xr-x. 1 root root 1090007 Feb 5 14:04 ssg-rhel6-xccdf.xml
[root@rhel6 scap-security-guide]# ll /usr/share/xml/scap/ssg/guide/
total 2060
-rwxr-xr-x. 1 root root 414128 Feb 5 14:04 JBossEAP5_Guide.html
-rwxr-xr-x. 1 root root 1689021 Feb 5 14:04 rhel6-guide.html
---
Makefile | 12 +++++++++++-
scap-security-guide.spec | 2 ++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8441634..ab1deca 100644
--- a/Makefile
+++ b/Makefile
@@ -41,8 +41,18 @@ rhel6:
tarball:
$(call rpm-prep)
- cp -r RHEL6 $(RPM_TMPDIR)/$(PKG)
+
+ # Copy in the source trees for both RHEL6
+ # and JBossEAP5 content
+ cp -r RHEL6 $(RPM_TMPDIR)/$(PKG)
+ cp -r JBossEAP5 $(RPM_TMPDIR)/$(PKG)
+
+ # Don't trust the developers, clean out the build
+ # environment before packaging
cd $(RPM_TMPDIR)/$(PKG)/RHEL6 && $(MAKE) clean
+
+ # Create the source tar, copy it to $TARBALL
+ # (e.g. somewhere in the SOURCES directory)
cd $(RPM_TMPDIR) && tar -czf $(PKG).tar.gz $(PKG)
cp $(RPM_TMPDIR)/$(PKG).tar.gz $(TARBALL)
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index f23d392..d342aa6 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -37,6 +37,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/en/man8/
# Add in core content (SCAP, guide, tables)
cp -r RHEL6/dist/* $RPM_BUILD_ROOT/usr/share/xml/scap/ssg/
+cp JBossEAP5/eap5-* $RPM_BUILD_ROOT/usr/share/xml/scap/ssg/content/
+cp JBossEAP5/docs/JBossEAP5_Guide.html
$RPM_BUILD_ROOT/usr/share/xml/scap/ssg/guide/
# Add in manpage
gzip -c RHEL6/input/auxiliary/ssg.8 >
$RPM_BUILD_ROOT/usr/share/man/en/man8/ssg.8.gz
--
1.7.1
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
