From ffb3d08bc6f7d8974525a9c68a5498c808fa7adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Luka=C5=A1=C3=ADk?= <slukasik@redhat.com>
Date: Wed, 24 Jun 2015 10:14:23 +0200
Subject: [PATCH] scap-security-guide-0.1.24-1

---
 .gitignore               |  2 ++
 scap-security-guide.spec | 53 ++++++++++++++++++++++++++++------------
 sources                  |  2 +-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7b0699..6f4a05a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /scap-security-guide-0.1.19.tar.gz
 /scap-security-guide-0.1.21.tar.gz
 /v0.1.22.tar.gz
+/v0.1.23.tar.gz
+/v0.1.24.tar.gz
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 5038d8a..a03339b 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -6,13 +6,13 @@
 # this one).
 
 Name:		scap-security-guide
-Version:	0.1.22
-Release:	2%{?dist}
+Version:	0.1.24
+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:	https://github.com/OpenSCAP/scap-security-guide/archive/v0.1.22.tar.gz
+Source0:	https://github.com/OpenSCAP/scap-security-guide/archive/v%{version}.tar.gz
 BuildArch:	noarch
 BuildRequires:	libxslt, expat, python
 BuildRequires:	python-lxml
@@ -34,41 +34,62 @@ scap-workbench GUI tool from scap-workbench package to verify that the system
 conforms to provided guideline. Refer to scap-security-guide(8) manual page for
 further information.
 
+%package	doc
+Summary:	HTML formatted documents containing security guides generated from XCCDF benchmarks.
+Group:		System Environment/Base
+Requires:	%{name} = %{version}-%{release}
+
+%description	doc
+The %{name}-doc package contains HTML formatted documents containing
+hardening guidances that have been generated from XCCDF benchmarks
+present in %{name} package.
+
 %prep
 %setup -q -D -n %{name}-%{version}
 
 %build
 make %{?_smp_mflags} dist
-make %{?_smp_mflags} dist -C Firefox
-make %{?_smp_mflags} dist -C Java
 
 %install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# bugfix for ssg-0.1.24
+mv %{buildroot}/usr/man %{buildroot}%{_mandir}
+
+# bugfix for ssg-0.1.24
+mkdir -p %{buildroot}/%{_docdir}/%{name}/guides
+mv %{buildroot}/%{_docdir}/%{name}/*.html %{buildroot}/%{_docdir}/%{name}/guides
+
 # Install DataStream files
-mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/content/
-for target in Firefox Fedora Java RHEL/6 RHEL/7
+for target in Firefox JRE
 do
 	cp -a $target/dist/content/ssg-*-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/
 done
 
-# 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
-
 # Docs
-mkdir -p %{buildroot}/%{_docdir}/%{name}
 mkdir -p %{buildroot}/%{_docdir}/%{name}/Firefox
 cp -a Firefox/DISCLAIMER %{buildroot}/%{_docdir}/%{name}/Firefox
-
+install -m 0644 README.md %{buildroot}/%{_docdir}/%{name}
+install -m 0644 LICENSE %{buildroot}/%{_docdir}/%{name}
 
 %files
 %{_datadir}/xml/scap
+%{_datadir}/%{name}
 %lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
-%docdir %{_docdir}/%{name}
-%doc Fedora/LICENSE Fedora/output/ssg-fedora-common-guide.html
-%doc RHEL/6/input/auxiliary/DISCLAIMER
+%doc %{_docdir}/%{name}/Firefox/DISCLAIMER
+%doc %{_docdir}/%{name}/LICENSE
+%doc %{_docdir}/%{name}/README.md
 
+%files doc
+%doc %{_docdir}/%{name}/guides/*.html
 
 %changelog
+* Thu Jul 09 2015 Šimon Lukašík <slukasik@redhat.com> - 0.1.24-1
+- update to the latest upstream release
+- created doc sub-package to ship all the guides
+- start distributing centos and scientific linux content
+- rename java content to jre
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.22-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 69df78c..11917d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08b30c45b332fdb314b64903e80a8e9c  v0.1.22.tar.gz
+83a72864d511daf857a435ba3cbe0d44  v0.1.24.tar.gz