scap-security-guide-0.1.43

This commit is contained in:
Watson Sato 2019-02-22 11:30:32 +01:00
parent 29a9c19ed0
commit ab2790cbb2
4 changed files with 11 additions and 28 deletions

1
.gitignore vendored
View File

@ -28,3 +28,4 @@
/scap-security-guide-0.1.40.tar.bz2 /scap-security-guide-0.1.40.tar.bz2
/scap-security-guide-0.1.41.tar.bz2 /scap-security-guide-0.1.41.tar.bz2
/scap-security-guide-0.1.42.tar.bz2 /scap-security-guide-0.1.42.tar.bz2
/scap-security-guide-0.1.43.tar.bz2

View File

@ -1,21 +0,0 @@
From 265795ea7034327bebeff684edb042c4ebf7d066 Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Wed, 12 Dec 2018 18:47:40 +0100
Subject: [PATCH] Make the man page depend of derivate contents
---
cmake/SSGCommon.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/SSGCommon.cmake b/cmake/SSGCommon.cmake
index 835598ef3a..b9755c1be9 100644
--- a/cmake/SSGCommon.cmake
+++ b/cmake/SSGCommon.cmake
@@ -798,6 +798,7 @@ macro(ssg_build_derivative_product ORIGINAL SHORTNAME DERIVATIVE)
add_custom_target(${DERIVATIVE} ALL)
add_dependencies(${DERIVATIVE} ${DERIVATIVE}-content)
+ add_dependencies(man_page ${DERIVATIVE})
add_dependencies(
${DERIVATIVE}-content

View File

@ -1,11 +1,10 @@
Name: scap-security-guide Name: scap-security-guide
Version: 0.1.42 Version: 0.1.43
Release: 2%{?dist} Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause License: BSD-3-Clause
URL: https://github.com/OpenSCAP/scap-security-guide/ URL: https://github.com/ComplianceAsCode/content/
Source0: https://github.com/OpenSCAP/scap-security-guide/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
Patch0: scap-security-guide-0.1.43-man-page-depend-on-derivatives.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: libxslt, expat, python3, openscap-scanner >= 1.2.5, cmake >= 3.8, python3-jinja2, python3-PyYAML BuildRequires: libxslt, expat, python3, openscap-scanner >= 1.2.5, cmake >= 3.8, python3-jinja2, python3-PyYAML
@ -36,7 +35,6 @@ present in %{name} package.
%prep %prep
%setup -q %setup -q
%patch0 -p1
mkdir build mkdir build
%build %build
@ -63,6 +61,11 @@ cd build
%doc %{_docdir}/%{name}/tables/*.html %doc %{_docdir}/%{name}/tables/*.html
%changelog %changelog
* Fri Feb 22 2019 Watson Yuuma Sato <wsato@redhat.com> - 0.1.43-1
- Update to latest upstream SCAP-Security-Guide-0.1.43 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.43
- Update URL and source URL
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.42-2 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.42-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.42.tar.bz2) = 718da052580eb05b78db12253e5122f0e400fdefae9e2c19d8717b20ab706b23513ad02880c6ff20d650cef5a46ec7ff91d3cfaf3ba5b2a38f5ed3aa1cbdd14a SHA512 (scap-security-guide-0.1.43.tar.bz2) = f9e9438551e62e3407a58d3a68c9f07f5d3c25b39984213cf6bfc17aa46f89ade3a4fd1591628e72af4fa2ed5f13a02fdc9bf023285abe82c3e79b6cf317d223