Hello Shawn,
as promised, attached is slightly enhanced patch
for RHEL6's spec file it to quieten more rpmlint
warnings:
* spaces 've been replaced with tabs globally,
* removed dot from Summary,
* updated license && group,
* replaced hard-coded paths with rpm macros,
* adjusted defattr rpmlint not to complain about
invalid shebangs. For now kept defattr there
(since other RHEL6 specs do too), but according
to Fedora PackagingGuidelines (section File Permissions):
https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines
it was necessary only in versions of rpm package
prior to 4.4. Since in RHEL6 there's rpm-4.8.0 currently,
that macro might not be even needed already.
* adjusted scap-security-guide manual page definition rpmlint
not to complain about missing %lang.
The rpmlint output has been reduced to two warnings / errors:
- one about the invalid source - as previously mentioned,
this is not something i can fix. Someone with proper privileges
needs to upload the tarball to pre-agreed https:// location first,
then that location needs to be listed after Source0: section of
the spec file to calm down this warning,
- the other one about the 'too much recursion / deep loop'
could be quieten by moving the Version and Release information
from the main Makefile into the RHEL6's scap-security-guide.spec
file (and for purpose of their use in the main Makefile
being extracted back from the spec file like Fedora case is doing).
But since this impacts main Makefile and the way how RHEL6
versioning would behave, i am gonna to wait with the change
till someone else approves / confirms, fixing this particular
rpmlint warning has higher priority than Version / Release being
in the main Makefile.
* didn't update the changelog entry yet (for case this wouldn't be
the final version).
Please review.
Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team
----- Original Message -----
> From: "Shawn Wells" <[email protected]>
> To: [email protected]
> Sent: Tuesday, October 1, 2013 4:43:07 AM
> Subject: [PATCH] [bugfix] Updated RPM spec file
>
>
>
> _______________________________________________
> scap-security-guide mailing list
> [email protected]
> https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
>
From 92f8716b3867285073077c9499dbd722390c8fc9 Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <[email protected]>
Date: Wed, 2 Oct 2013 18:23:43 +0200
Subject: [PATCH] [bugfix] Update RHEL6 RPM spec file
Signed-off-by: Jan Lieskovsky <[email protected]>
---
scap-security-guide.spec | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
mode change 100755 => 100644 JBossEAP5/eap5-cpe-dictionary.xml
diff --git a/JBossEAP5/eap5-cpe-dictionary.xml b/JBossEAP5/eap5-cpe-dictionary.xml
old mode 100755
new mode 100644
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 5fc888c..aea7886 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,19 +1,19 @@
-Name: scap-security-guide
-Version: %{version}
-Release: %{release}
-Summary: Security guidance and baselines in SCAP formats.
+Name: scap-security-guide
+Version: %{version}
+Release: %{release}
+Summary: Security guidance and baselines in SCAP formats
-Group: Testing
-License: Public domain and GPL
-URL: https://fedorahosted.org/scap-security-guide/
+Group: System Environment/Base
+License: Public Domain
+URL: https://fedorahosted.org/scap-security-guide/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0: %{name}-%{version}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: %{arch}
-BuildRequires: coreutils, libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml
-Requires: filesystem, openscap-utils >= 0.9.1
+BuildRequires: coreutils, libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml
+Requires: filesystem, openscap-utils >= 0.9.1
%description
The scap-security-guide project provides security configuration guidance in
@@ -32,27 +32,27 @@ cd RHEL6 && make dist
%install
rm -rf $RPM_BUILD_ROOT
#make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/share/xml/scap/ssg/
-mkdir -p $RPM_BUILD_ROOT/usr/share/man/en/man8/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xml/scap/ssg/
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/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/
+cp -r RHEL6/dist/* $RPM_BUILD_ROOT%{_datadir}/xml/scap/ssg/
+cp JBossEAP5/eap5-* $RPM_BUILD_ROOT%{_datadir}/xml/scap/ssg/content/
+cp JBossEAP5/docs/JBossEAP5_Guide.html $RPM_BUILD_ROOT%{_datadir}/xml/scap/ssg/guide/
# Add in manpage
-gzip -c RHEL6/input/auxiliary/scap-security-guide.8 > $RPM_BUILD_ROOT/usr/share/man/en/man8/scap-security-guide.8.gz
+gzip -c RHEL6/input/auxiliary/scap-security-guide.8 > $RPM_BUILD_ROOT%{_mandir}/en/man8/scap-security-guide.8.gz
makewhatis
-chcon -u system_u $RPM_BUILD_ROOT/usr/share/man/en/man8/scap-security-guide.8.gz
+chcon -u system_u $RPM_BUILD_ROOT%{_mandir}/en/man8/scap-security-guide.8.gz
%clean
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(0644,root,root,0755)
-%attr(0755,root,root) /usr/share/xml/scap/ssg
-%attr(0644,root,root) /usr/share/man/en/man8/scap-security-guide.8.gz
+%defattr(-,root,root,-)
+%{_datadir}/xml/scap/ssg
+%lang(en) %{_mandir}/en/man8/scap-security-guide.8.gz
%changelog
--
1.7.11.7
_______________________________________________
scap-security-guide mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/scap-security-guide
