From 34ff3c5470c567ab0699579681da9c342ac933d3 Mon Sep 17 00:00:00 2001
From: Jan Lieskovsky <jlieskov@redhat.com>
Date: Mon, 27 Jun 2016 17:08:22 +0200
Subject: [PATCH] Correct currently failing parallel SCAP Security Guide build

---
 ...Fix-Infrastructure-Fix-parallel-make.patch | 42 +++++++++++++++++++
 scap-security-guide.spec                      |  8 +++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 0001-BugFix-Infrastructure-Fix-parallel-make.patch

diff --git a/0001-BugFix-Infrastructure-Fix-parallel-make.patch b/0001-BugFix-Infrastructure-Fix-parallel-make.patch
new file mode 100644
index 0000000..a75a33e
--- /dev/null
+++ b/0001-BugFix-Infrastructure-Fix-parallel-make.patch
@@ -0,0 +1,42 @@
+From de6aa6fdf977a8bc0022ceff1b219380573c9621 Mon Sep 17 00:00:00 2001
+From: Jan Lieskovsky <jlieskov@redhat.com>
+Date: Mon, 27 Jun 2016 15:33:13 +0200
+Subject: [PATCH] [BugFix] [Infrastructure] Fix parallel make
+
+As visible e.g. in:
+  https://kojipkgs.fedoraproject.org//work/tasks/1659/14671659/build.log
+
+attempt to build current SSG master in parallel:
+  + cd scap-security-guide-0.1.30
+  + make -j4 dist
+  ..
+
+fails with:
+  ..
+  mkdir ../shared/output
+  mkdir ../shared/output
+  xsltproc -o output/guide.xml ../shared/transforms/includelogo.xslt input/guide.xml
+  mkdir: cannot create directory '../shared/output': File exists
+  ..
+
+Fix that (so "make -j4 dist" will work again)
+---
+ shared/product-make.include | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shared/product-make.include b/shared/product-make.include
+index 53fe067..c4c8e2e 100644
+--- a/shared/product-make.include
++++ b/shared/product-make.include
+@@ -55,7 +55,7 @@ $(OUT)/shorthand.xml: $(OUT)/guide.xml $(IN)/guide.xslt $(guide_xslt_deps)
+ # Create temporary $(SHARED)/$(OUT) folder to hold information like list of contributors or list of
+ # available remediation functions used by all SSG benchmarks
+ $(SHARED)/$(OUT):
+-	mkdir $@
++	mkdir -p $@
+ 
+ # Benchmark metadata prerequisite - derive $(SHARED)/$(OUT)/contributors.xml from the content of Contributors.md
+ $(SHARED)/$(OUT)/contributors.xml: $(SHARED)/$(OUT)
+-- 
+2.4.11
+
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index e49eb66..2e22d61 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -7,13 +7,14 @@
 
 Name:		scap-security-guide
 Version:	0.1.30
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 Group:		Applications/System
 License:	Public Domain
 URL:		https://github.com/OpenSCAP/scap-security-guide/
 Source0:	https://github.com/OpenSCAP/scap-security-guide/archive/v%{version}.tar.gz
 Patch1:		scap-security-guide-0.1.30-drop-remediations-functions-library.patch
+Patch2:		0001-BugFix-Infrastructure-Fix-parallel-make.patch
 BuildArch:	noarch
 BuildRequires:	libxslt, expat, python
 BuildRequires:	python-lxml
@@ -49,6 +50,8 @@ present in %{name} package.
 %setup -q -D -n %{name}-%{version}
 # Drop remediation_functions shell library (not needed starting from 0.1.30)
 %patch1 -p1 -b .drop_remediation_functions_library
+# Fix parallel build
+%patch2 -p1 -b .parallel_build
 
 %build
 make %{?_smp_mflags} dist
@@ -78,6 +81,9 @@ install -m 0644 LICENSE %{buildroot}/%{_docdir}/%{name}
 %doc %{_docdir}/%{name}/guides/*.html
 
 %changelog
+* Mon Jun 27 2016 Jan iankko Lieskovsky <jlieskov@redhat.com> - 0.1.30-2
+- Correct currently failing parallel SCAP Security Guide build
+
 * Mon Jun 27 2016 Jan iankko Lieskovsky <jlieskov@redhat.com> - 0.1.30-1
 - Update to latest upstream SCAP-Security-Guide-0.1.30 release:
   https://github.com/OpenSCAP/scap-security-guide/releases/tag/v0.1.30