This patch projects fixes for objections raised within scap-security-guide RPM package review request (RH BZ#1018905) to RHEL6 content building functionality too, so we could package it into EPEL-6.
More exactly: * remove BuildRoot (not needed already), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* remove coreutils from BuildRequires, filesystem from Requires (not needed), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* add xml-common to Requires (so /usr/share/xml/scap directory would be also owned by scap-security-guide RPM - see also below), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c8
* update %description to be more clear (some sentences were reported as to be harder to understand), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c8 https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c9 https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c10
* replace $RPM_BUILD_ROOT with %{buildroot} in %install section (%{buildroot} is defined on RHEL6 as can be verified with: rpm --eval '%{buildroot}' command) https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* remove not necessary %install section bits (removing former RPM_BUILD_ROOT etc.) https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c1
* adjust adding of core content (replace $RPM_BUILD_ROOT, exactly list directories that will get copied - IOW copy just content/ and policytables/ ones. HTML guides from previous guide/ will be stored under scap-security-guide's %doc directory), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c8
* don't directly compress the manual page and rather let the build system to choose which compress algorithm to use (for case compression algorithm would change) https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* don't confine the manual page (not needed), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* remove the %clean section (not needed), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* remove defattr from %files section (was required only on rpm < 4.4), http://fedoraproject.org/wiki/Packaging:Guidelines#File_Permissions
* modify %files path after %{_datadir} (replace /xml/scap/ssg with /xml/scap so /usr/share/xml/scap/ directory is also owned by scap-security-guide package, and removed too by package removal), https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4 https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c8
* add LICENSE into RHEL6 subdirectory, https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c4
* package LICENSE, RHEL6 and JBossEAP5 guide under scap-security-guide's RPM %doc directory. https://bugzilla.redhat.com/show_bug.cgi?id=1018905#c8
Sanity && regression testing: - make tarball, make srpm, make rpm => PASS, - RHEL6's make, make validate, make validate-xml, make content, make guide, make dist, make eval-common, make checks, make tables => PASS, - oscap xccdf eval for generated XCCDF file: $ export SSG="/usr/share/xml/scap/ssg/content" $ oscap xccdf eval --profile common --cpe $SSG/ssg-rhel6-cpe-dictionary.xml \ --report /tmp/el6.html $SSG/ssg-rhel6-xccdf.xml
=> PASS, - HTML guides for both RHEL6 and JBossEAP are packaged too, and look reasonable in quick firefox preview.
Please review.
Thank you && Regards, Jan. -- Jan iankko Lieskovsky / Red Hat Security Technologies Team
On 10/25/13, 10:59 AM, Jan Lieskovsky wrote:
%files -%defattr(-,root,root,-) -%{_datadir}/xml/scap/ssg +%{_datadir}/xml/scap %lang(en) %{_mandir}/en/man8/scap-security-guide.8.gz +%doc RHEL6/LICENSE RHEL6/output/rhel6-guide.html JBossEAP5/docs/JBossEAP5_Guide.html
Should the policytables/ contents be added to %doc?
----- Original Message -----
From: "Shawn Wells" shawn@redhat.com Cc: scap-security-guide@lists.fedorahosted.org Sent: Friday, October 25, 2013 6:21:13 PM Subject: Re: [PATCH] [RHEL6] Apply spec file changes required by review request (RH BZ#1018905)
On 10/25/13, 10:59 AM, Jan Lieskovsky wrote:
%files -%defattr(-,root,root,-) -%{_datadir}/xml/scap/ssg +%{_datadir}/xml/scap %lang(en) %{_mandir}/en/man8/scap-security-guide.8.gz +%doc RHEL6/LICENSE RHEL6/output/rhel6-guide.html JBossEAP5/docs/JBossEAP5_Guide.html
Should the policytables/ contents be added to %doc?
This is good catch. Yeah, looks RHEL6/output/table-rhel6* are also html files, so should go under %doc dir too.
Copy just RHEL6/output/table-rhel6* files (like it's currently done in Makefile), or those two table-rhel5* ones too?
Thank you && Regards, Jan. -- Jan iankko Lieskovsky / Red Hat Security Technologies Team
scap-security-guide mailing list scap-security-guide@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
On 10/25/13, 12:39 PM, Jan Lieskovsky wrote:
----- Original Message -----
From: "Shawn Wells"shawn@redhat.com Cc:scap-security-guide@lists.fedorahosted.org Sent: Friday, October 25, 2013 6:21:13 PM Subject: Re: [PATCH] [RHEL6] Apply spec file changes required by review request (RH BZ#1018905)
On 10/25/13, 10:59 AM, Jan Lieskovsky wrote:
%files -%defattr(-,root,root,-) -%{_datadir}/xml/scap/ssg +%{_datadir}/xml/scap %lang(en) %{_mandir}/en/man8/scap-security-guide.8.gz +%doc RHEL6/LICENSE RHEL6/output/rhel6-guide.html JBossEAP5/docs/JBossEAP5_Guide.html
Should the policytables/ contents be added to %doc?
This is good catch. Yeah, looks RHEL6/output/table-rhel6* are also html files, so should go under %doc dir too.
Copy just RHEL6/output/table-rhel6* files (like it's currently done in Makefile), or those two table-rhel5* ones too?
table-rhel6-* and table-stig-rhel6.html (i'm not sure how this was missed before)
scap-security-guide@lists.fedorahosted.org
-
Jan Lieskovsky -
Shawn Wells