The upstream started to package everything into a single tarball

That gave as a chance to clean up our spec file and we will have
chance to include other guidances in future.
This commit is contained in:
Šimon Lukašík 2014-10-02 10:56:50 +02:00
parent 6d9587aa25
commit 57b107c947
3 changed files with 10 additions and 25 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/scap-security-guide-0.1-16.tar.gz
/scap-security-guide-0.1.5.tar.gz
/scap-security-guide-0.1.18.tar.gz
/scap-security-guide-0.1.19.tar.gz

View File

@ -5,22 +5,14 @@
# file one level up - in the main scap-security-guide directory (instead of
# this one).
# Used for Fedora scap-security-guide RPM package versioning
%global fedorassgversion 5
# Used to specify RHEL scap-security-guide tarball source
# (needs to match latest EPEL-6 scap-security-guide RPM release)
%global rhelssgsource 0.1.18
Name: scap-security-guide
Version: 0.1.%{fedorassgversion}
Release: 4%{?dist}
Version: 0.1.19
Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats
Group: Applications/System
License: Public Domain
URL: https://fedorahosted.org/scap-security-guide/
Source0: http://fedorapeople.org/~jlieskov/%{name}-%{version}.tar.gz
Source1: http://repos.ssgproject.org/sources/%{name}-%{rhelssgsource}.tar.gz
Source0: http://repos.ssgproject.org/sources/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: libxslt, expat, python
BuildRequires: python-lxml
@ -43,17 +35,12 @@ conforms to provided guideline. Refer to scap-security-guide(8) manual page for
further information.
%prep
%setup -q -D -n %{name}-%{version} -a1
%setup -q -D -n %{name}-%{version}
%build
# Build Fedora distribution content
(cd Fedora && make dist)
# Change CWD to point to RHEL content. Build RHEL content
pushd %{name}-%{rhelssgsource}
(cd RHEL/6 && make dist)
(cd RHEL/7 && make dist)
# Restore CWD to old value
popd
%install
# Create required directory structure
@ -66,24 +53,22 @@ cp -a Fedora/dist/content/* %{buildroot}%{_datadir}/xml/scap/ssg/fedora
# Add in Fedora manpage
cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man8/scap-security-guide.8
# Change CWD to point to RHEL content. Copy
# datastreams to appropriate buildroot places
pushd %{name}-%{rhelssgsource}
# Add in datastream form of RHEL-6 benchmark
cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel6
# Add in datastream form of RHEL-7 benchmark
cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel7
# Restore CWD to old value
popd
%files
%{_datadir}/xml/scap
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
%doc Fedora/LICENSE Fedora/output/ssg-fedora-guide.html
%doc %{name}-%{rhelssgsource}/RHEL/6/input/auxiliary/DISCLAIMER
%doc RHEL/6/input/auxiliary/DISCLAIMER
%changelog
* Thu Oct 02 2014 Šimon Lukašík <slukasik@redhat.com> - 0.1.19-1
- update to the latest upstream release
* Mon Jul 14 2014 Šimon Lukašík <slukasik@redhat.com> - 0.1.5-4
- require only openscap-scanner, not whole openscap-utils package

View File

@ -1,2 +1 @@
01afab523a88cb3faa643796a93e9d0e scap-security-guide-0.1.5.tar.gz
3cd8d02a0550b8e384db86b5f558c1fb scap-security-guide-0.1.18.tar.gz
026b521c4dbd6b69302376b407d1ed30 scap-security-guide-0.1.19.tar.gz