From 82445d8424bc5e48ee6aafdee3587b4d9894693f Mon Sep 17 00:00:00 2001
From: Matěj Týč <matyc@redhat.com>
Date: Jul 25 2018 15:39:18 +0000
Subject: Merge branch 'f28'


---

diff --git a/.gitignore b/.gitignore
index e961187..cb757c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /scap-security-guide-0.1.37.tar.bz2
 /scap-security-guide-0.1.38.tar.bz2
 /scap-security-guide-0.1.39.tar.bz2
+/scap-security-guide-0.1.40.tar.bz2
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 823fa58..7d3af67 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,6 +1,6 @@
 Name:		scap-security-guide
-Version:	0.1.39
-Release:	3%{?dist}
+Version:	0.1.40
+Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 Group:		Applications/System
 License:	Public Domain
@@ -8,7 +8,7 @@ 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
 BuildArch:	noarch
 
-BuildRequires:	libxslt, expat, python2, openscap-scanner >= 1.2.5, python2-lxml, cmake >= 2.8, python2-jinja2, PyYAML
+BuildRequires:	libxslt, expat, python3, openscap-scanner >= 1.2.5, cmake >= 3.8, python3-jinja2, python3-PyYAML
 Requires:	xml-common, openscap-scanner >= 1.2.5
 Obsoletes:	openscap-content < 0:0.9.13
 Provides:	openscap-content
@@ -63,6 +63,11 @@ cd build
 %doc %{_docdir}/%{name}/tables/*.html
 
 %changelog
+* Wed Jul 25 2018 Matěj Týč <matyc@redhat.com> - 0.1.40-1
+- Update to latest upstream SCAP-Security-Guide-0.1.40 release:
+  https://github.com/OpenSCAP/scap-security-guide/releases/tag/v0.1.40
+- Update to use Python3 for build.
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.39-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 00ecd2a..1080212 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.39.tar.bz2) = 597faf7b6cf9bed74c6e75cf88568a9b8ee8ac441d8f2cfa79d653d650e55920ef719f97b522254b1dffb71e3d2d08a871678186fbadf6a330b5a071a6c8e73f
+SHA512 (scap-security-guide-0.1.40.tar.bz2) = 8956c13447a7696abb8cd1dbc38f9196c97d632bf29c89636e71c5c0d4926a948a49ceb3059fa7b2a28d8b497697c7b5ab25437519ba64bbbf231517553b36df