Fix man page build dependency

The man page target should also depend on derivative content.
This commit is contained in:
Watson Sato 2018-12-13 17:08:36 +01:00
parent a4703bf4f0
commit 5781d0c746
2 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,21 @@
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

@ -6,6 +6,7 @@ Group: Applications/System
License: BSD-3-Clause
URL: https://github.com/OpenSCAP/scap-security-guide/
Source0: https://github.com/OpenSCAP/scap-security-guide/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
BuildRequires: libxslt, expat, python3, openscap-scanner >= 1.2.5, cmake >= 3.8, python3-jinja2, python3-PyYAML
@ -37,6 +38,7 @@ present in %{name} package.
%prep
%setup -q
%patch0 -p1
mkdir build
%build
@ -66,6 +68,7 @@ cd build
* Wed Dec 12 2018 Watson Yuuma Sato <wsato@redhat.com> - 0.1.42-1
- Update to latest upstream SCAP-Security-Guide-0.1.42 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.42
- Fix man page build dependency on derivative content
* Mon Oct 01 2018 Watson Yuuma Sato <wsato@redhat.com> - 0.1.41-1
- Update to latest upstream SCAP-Security-Guide-0.1.41 release: