[scap-security-guide/f20] Rebase the RHEL part of SSG to the latest upstream version (0.1.18)

[Šimon Lukašík]

commit 9249049b649310a3d646214b916f77e1bf6716f8
Author: Simon Lukasik <slukasik at redhat.com>
Date:   Tue Jul 1 12:28:13 2014 +0200

    Rebase the RHEL part of SSG to the latest upstream version (0.1.18)
    
    (cherry picked from commit cdbf042df2960a3273da2ecb8fff5c801b63c0b7)
    
    Conflicts:
    	scap-security-guide.spec (release number)

 .gitignore               |    1 +
 scap-security-guide.spec |    7 +++++--
 sources                  |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb2664b..30d4f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /scap-security-guide-0.1.4.tar.gz
 /scap-security-guide-0.1-16.tar.gz
 /scap-security-guide-0.1.5.tar.gz
+/scap-security-guide-0.1.18.tar.gz
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index ef6bf71..4b5f20e 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -10,11 +10,11 @@
 
 # Used to specify RHEL scap-security-guide tarball source
 # (needs to match latest EPEL-6 scap-security-guide RPM release)
-%global	rhelssgsource		0.1-16
+%global	rhelssgsource		0.1.18
 
 Name:		scap-security-guide
 Version:	0.1.%{fedorassgversion}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 Group:		Applications/System
 License:	Public Domain
@@ -80,6 +80,9 @@ popd
 
 
 %changelog
+* Tue Jul 01 2014 Šimon Lukašík <slukasik at redhat.com> - 0.1.5-2
+- Rebase the RHEL part of SSG to the latest upstream version (0.1.18)
+
 * Thu Feb 27 2014 Jan iankko Lieskovsky <jlieskov at redhat.com> 0.1.5-1
 - Fix fedora-srpm and fedora-rpm Make targets to work again
 - Include RHEL-6 and RHEL-7 datastream files to support remote RHEL system scans
diff --git a/sources b/sources
index d3a32ac..223b0d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c4487f3c77067bb324b82b99dc33d476  scap-security-guide-0.1-16.tar.gz
 01afab523a88cb3faa643796a93e9d0e  scap-security-guide-0.1.5.tar.gz
+3cd8d02a0550b8e384db86b5f558c1fb  scap-security-guide-0.1.18.tar.gz