[PATCH] Fix paths and requires in spec file.

Spencer Shimko sshimko at tresys.com
Tue Aug 28 18:17:52 UTC 2012


The spec file was dropping things in /usr/local.  Shift it to
/usr/share/doc/scap-security-guide-<version>.

Update Requires and BuildRequires based on perusal of apps leveraged
during build.

Signed-off-by: Spencer Shimko <sshimko at tresys.com>
---
 scap-security-guide.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 55e22a5..0867fb1 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -12,8 +12,8 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:	%{arch}
 
-BuildRequires:  /bin/rm, /bin/mkdir, /bin/cp
-Requires:       /bin/bash, /bin/date, /usr/bin/oscap
+BuildRequires:  coreutils, libxslt, expat, python
+Requires:       coreutils, openscap
 
 %description
 The scap-security-guide project provides security configuration guidance in
@@ -28,13 +28,12 @@ requirements and specific implementation guidance.
 %build
 cd RHEL6 && make dist
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 #make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/local/%{name}/
+mkdir -p $RPM_BUILD_ROOT/%{_usr}/share/doc/%{name}-%{version}/
 
-cp -r RHEL6/dist/* $RPM_BUILD_ROOT/usr/local/%{name}/
+cp -r RHEL6/dist/* $RPM_BUILD_ROOT/%{_usr}/share/doc/%{name}-%{version}/
 
 
 %clean
@@ -43,10 +42,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644,root,root,0755)
-%attr(0755,root,root) /usr/local/scap-security-guide/
+%attr(0755,root,root) %{_usr}/share/doc/%{name}-%{version}/
 
 
 %changelog
+* Tue Aug 28  2012 Spencer Shimko <sshimko at tresys.com> 1.0-4
+- Move away from using /usr/local for installation dir.
+- Fix BuildRequires and Requires.
+
 * Wed Jul 3 2012 Jeffrey Blank <blank at eclipse.ncsc.mil> 1.0-3
 - Modified install section, made description more concise.
 
-- 
1.7.1



More information about the scap-security-guide mailing list