On 10/26/13, 9:03 AM, Jan Lieskovsky wrote:
This patch removes duplicate inclusion of policytables HTML
files in the newly generated RPM file (they are in %doc,
so no need to include them under policytables/ directory too -
compare output of:
prev_scap-security-guide-0.1-15.rc3.el6.noarch_rpm_list_output.txt
vs output of:
curr_scap-security-guide-0.1-15.rc4.el6.noarch_rpm_list_output.txt
It also removes call for 'makewhatis' - it's not necessary to
explicitly call it after adding the new manual page. Let the
system to realize new manual page got added and launch man db
update automa{t,g}ically.
Sanity && regression testing:
- make tarball, (s)rpm passed,
- common RHEL-6 Makefile targets passed too,
- guide(s) is(are) generated properly and look reasonable.
Please review.
Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
curr_scap-security-guide-0.1-15.rc4.el6.noarch_rpm_list_output.txt
[iankko@host RHEL6]# rpm -q scap-security-guide
scap-security-guide-0.1-15.rc4.el6.noarch
[iankko@host RHEL6]# rpm -ql scap-security-guide
/usr/share/doc/scap-security-guide-0.1
/usr/share/doc/scap-security-guide-0.1/JBossEAP5_Guide.html
/usr/share/doc/scap-security-guide-0.1/LICENSE
/usr/share/doc/scap-security-guide-0.1/rhel6-guide.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-cces.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-nistrefs-common.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-nistrefs.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap-flat.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap-flat.xhtml
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-stig.html
/usr/share/man/en/man8/scap-security-guide.8.gz
/usr/share/xml/scap
/usr/share/xml/scap/ssg
/usr/share/xml/scap/ssg/content
/usr/share/xml/scap/ssg/content/eap5-cpe-dictionary.xml
/usr/share/xml/scap/ssg/content/eap5-cpe-oval.xml
/usr/share/xml/scap/ssg/content/eap5-ocil.xml
/usr/share/xml/scap/ssg/content/eap5-oval.xml
/usr/share/xml/scap/ssg/content/eap5-xccdf.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-cpe-dictionary.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-cpe-oval.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-oval.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-xccdf.xml
prev_scap-security-guide-0.1-15.rc3.el6.noarch_rpm_list_output.txt
[iankko@host scap-security-guide]# rpm -q scap-security-guide
scap-security-guide-0.1-15.rc3.el6.noarch
[iankko@host scap-security-guide]# rpm -ql scap-security-guide
/usr/share/doc/scap-security-guide-0.1
/usr/share/doc/scap-security-guide-0.1/JBossEAP5_Guide.html
/usr/share/doc/scap-security-guide-0.1/LICENSE
/usr/share/doc/scap-security-guide-0.1/rhel6-guide.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-cces.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-nistrefs-common.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-nistrefs.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap-flat.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap-flat.xhtml
/usr/share/doc/scap-security-guide-0.1/table-rhel6-srgmap.html
/usr/share/doc/scap-security-guide-0.1/table-rhel6-stig.html
/usr/share/man/en/man8/scap-security-guide.8.gz
/usr/share/xml/scap
/usr/share/xml/scap/ssg
/usr/share/xml/scap/ssg/content
/usr/share/xml/scap/ssg/content/eap5-cpe-dictionary.xml
/usr/share/xml/scap/ssg/content/eap5-cpe-oval.xml
/usr/share/xml/scap/ssg/content/eap5-ocil.xml
/usr/share/xml/scap/ssg/content/eap5-oval.xml
/usr/share/xml/scap/ssg/content/eap5-xccdf.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-cpe-dictionary.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-cpe-oval.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-oval.xml
/usr/share/xml/scap/ssg/content/ssg-rhel6-xccdf.xml
/usr/share/xml/scap/ssg/policytables
/usr/share/xml/scap/ssg/policytables/table-rhel6-cces.html
/usr/share/xml/scap/ssg/policytables/table-rhel6-nistrefs-common.html
/usr/share/xml/scap/ssg/policytables/table-rhel6-nistrefs.html
/usr/share/xml/scap/ssg/policytables/table-rhel6-srgmap-flat.html
/usr/share/xml/scap/ssg/policytables/table-rhel6-srgmap-flat.xhtml
/usr/share/xml/scap/ssg/policytables/table-rhel6-srgmap.html
/usr/share/xml/scap/ssg/policytables/table-rhel6-stig.html
0001-RHEL6-Don-t-include-the-table-html-files-two-times.-.patch
From 88c9fc7dd4e195067124307ee9f8bec36495e44e Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky<jlieskov(a)redhat.com>
Date: Sat, 26 Oct 2013 14:56:21 +0200
Subject: [PATCH] [RHEL6] Don't include the table html files two times. Remove
makewhatis (let system regenerate man db)
Signed-off-by: Jan Lieskovsky<jlieskov(a)redhat.com>
---
RHEL6/Makefile | 5 ++---
scap-security-guide.spec | 12 +++++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/RHEL6/Makefile b/RHEL6/Makefile
index 9e6159f..2107870 100644
--- a/RHEL6/Makefile
+++ b/RHEL6/Makefile
@@ -114,13 +114,12 @@ eval-common:
# items in dist are expected for distribution in an rpm
dist: tables guide content
- mkdir -p $(DIST)/content $(DIST)/policytables
+ mkdir -p $(DIST)/content
cp $(OUT)/$(ID)-rhel6-xccdf.xml $(DIST)/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)/table-rhel6-* $(DIST)/policytables
clean:
rm -f $(OUT)/*.xml $(OUT)/*.html $(OUT)/*.xhtml $(OUT)/*.pdf $(OUT)/*.spec
$(OUT)/*.tar $(OUT)/*.gz $(OUT)/*.ini $(OUT)/*.csv
- rm -rf $(DIST)/content $(DIST)/policytables
+ rm -rf $(DIST)/content
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 718d0bf..f9828fc 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,5 +1,5 @@
-%global redhatssgrelease 15.rc3
+%global redhatssgrelease 15.rc4
Name: scap-security-guide
Version: 0.1
@@ -36,17 +36,15 @@ guideline. Refer to scap-security-guide(8) manual page for further
information.
cd RHEL6 && make dist
%install
-mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/{content,policytables}
+mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/content
mkdir -p %{buildroot}%{_mandir}/en/man8/
-# Add in core content (SCAP, tables)
+# Add in core content (SCAP)
cp -a RHEL6/dist/content/* %{buildroot}%{_datadir}/xml/scap/ssg/content/
-cp -a RHEL6/dist/policytables/* %{buildroot}%{_datadir}/xml/scap/ssg/policytables/
Ugh - I felt like I was forgetting something when adding the files to
%doc. Thanks for cleaning this up.
cp -a JBossEAP5/eap5-*
%{buildroot}%{_datadir}/xml/scap/ssg/content/
# Add in manpage
cp -a RHEL6/input/auxiliary/scap-security-guide.8
%{buildroot}%{_mandir}/en/man8/scap-security-guide.8
-makewhatis
%files
%{_datadir}/xml/scap
@@ -54,6 +52,10 @@ makewhatis
%doc RHEL6/LICENSE RHEL6/output/rhel6-guide.html RHEL6/output/table-rhel6-cces.html
RHEL6/output/table-rhel6-nistrefs-common.html RHEL6/output/table-rhel6-nistrefs.html
RHEL6/output/table-rhel6-srgmap-flat.html RHEL6/output/table-rhel6-srgmap-flat.xhtml
RHEL6/output/table-rhel6-srgmap.html RHEL6/output/table-rhel6-stig.html
JBossEAP5/docs/JBossEAP5_Guide.html
%changelog
+* Sat Oct 26 2013 Jan iankko Lieskovsky<jlieskov(a)redhat.com> 0.1-15.rc4
+- Don't include the table html files two times
+- Remove makewhatis
+
* Fri Oct 25 2013 Shawn Wells<shawn(a)redhat.com> 0.1-15.rc3
- [bugfix] Updated rsyslog_remote_loghost to scan/etc/rsyslog.conf and
/etc/rsyslog.d/*
- Numberous XCCDF->OVAL naming schema updates
-- 1.8.3.1
I went ahead and pushed this:
https://git.fedorahosted.org/cgit/scap-security-guide.git/commit/?id=2413...