[PATCH] [RHEL6] Apply spec file changes required by review request (RH BZ#1018905)
Jan Lieskovsky
jlieskov at redhat.com
Fri Oct 25 14:59:03 UTC 2013
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-RHEL6-Apply-spec-file-changes-required-by-review-req.patch
Type: text/x-patch
Size: 7621 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/scap-security-guide/attachments/20131025/0d0aaf4f/attachment.bin>
More information about the scap-security-guide
mailing list