From 283befe40f2fc69af1e1fc4b7a719a9ddb0c49b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= Date: Tue, 5 May 2015 19:43:58 +0200 Subject: [PATCH] Refactor: Install all DataStreams at once We will shortly add more and more DataStreams to the show. --- scap-security-guide.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 408d8f4..ec8e885 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -41,20 +41,17 @@ further information. make %{?_smp_mflags} dist %install -# Create required directory structure +# Install DataStream files mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/content/ -mkdir -p %{buildroot}%{_mandir}/en/man8/ +for target in Fedora RHEL/6 RHEL/7 +do + cp -a $target/dist/content/ssg-*-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ +done -# Add in core Fedora content (SCAP XCCDF and OVAL) -cp -a Fedora/dist/content/ssg-fedora-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ # Add in Fedora manpage +mkdir -p %{buildroot}%{_mandir}/en/man8/ cp -a docs/scap-security-guide.8 %{buildroot}%{_mandir}/en/man8/scap-security-guide.8 -# Add in datastream form of RHEL-6 benchmark -cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ -# Add in datastream form of RHEL-7 benchmark -cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ - %files %{_datadir}/xml/scap %lang(en) %{_mandir}/en/man8/scap-security-guide.8.*