From ab2790cbb2acb9c959a2a1170d1e36b4eaddfb0d Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Fri, 22 Feb 2019 11:30:32 +0100
Subject: [PATCH] scap-security-guide-0.1.43

---
 .gitignore                                    |  1 +
 ....1.43-man-page-depend-on-derivatives.patch | 21 -------------------
 scap-security-guide.spec                      | 15 +++++++------
 sources                                       |  2 +-
 4 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 scap-security-guide-0.1.43-man-page-depend-on-derivatives.patch

diff --git a/.gitignore b/.gitignore
index e8a5230..a4e98fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /scap-security-guide-0.1.40.tar.bz2
 /scap-security-guide-0.1.41.tar.bz2
 /scap-security-guide-0.1.42.tar.bz2
+/scap-security-guide-0.1.43.tar.bz2
diff --git a/scap-security-guide-0.1.43-man-page-depend-on-derivatives.patch b/scap-security-guide-0.1.43-man-page-depend-on-derivatives.patch
deleted file mode 100644
index 4ece392..0000000
--- a/scap-security-guide-0.1.43-man-page-depend-on-derivatives.patch
+++ /dev/null
@@ -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
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 822823c..356be15 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,11 +1,10 @@
 Name:		scap-security-guide
-Version:	0.1.42
-Release:	2%{?dist}
+Version:	0.1.43
+Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 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
+URL:		https://github.com/ComplianceAsCode/content/
+Source0:	https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
 BuildArch:	noarch
 
 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
 %setup -q
-%patch0 -p1
 mkdir build
 
 %build
@@ -63,6 +61,11 @@ cd build
 %doc %{_docdir}/%{name}/tables/*.html
 
 %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
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 7465990..5244edc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.42.tar.bz2) = 718da052580eb05b78db12253e5122f0e400fdefae9e2c19d8717b20ab706b23513ad02880c6ff20d650cef5a46ec7ff91d3cfaf3ba5b2a38f5ed3aa1cbdd14a
+SHA512 (scap-security-guide-0.1.43.tar.bz2) = f9e9438551e62e3407a58d3a68c9f07f5d3c25b39984213cf6bfc17aa46f89ade3a4fd1591628e72af4fa2ed5f13a02fdc9bf023285abe82c3e79b6cf317d223