[scap-security-guide/epel7] Rebase the RHEL part of SSG to the latest upstream version (0.1.18)
Šimon Lukašík
isimluk at fedoraproject.org
Tue Jul 1 12:51:17 UTC 2014
commit 13d5762efc8fd1bd470e47837b57005ca780f043
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:
.gitignore
scap-security-guide.spec
sources
.gitignore | 1 +
scap-security-guide.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af89ff5..ba764ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/scap-security-guide-0.1-16.tar.gz
/scap-security-guide-0.1.5.tar.gz
/scap-security-guide-0.1.17.tar.gz
+/scap-security-guide-0.1.18.tar.gz
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 7eb30f2..fc961cf 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.17
+%global rhelssgsource 0.1.18
Name: scap-security-guide
Version: 0.1.%{fedorassgversion}
-Release: 3%{?dist}
+Release: 4%{?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-4
+- Rebase the RHEL part of SSG to the latest upstream version (0.1.18)
+
* Mon May 12 2014 Šimon Lukašík <slukasik at redhat.com> - 0.1.5-3
- Rebase the RHEL part of ssg to the latest upstream version
diff --git a/sources b/sources
index c00f41a..223b0d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cc3b03c38126df830fffc0f39dce5a65 scap-security-guide-0.1.17.tar.gz
01afab523a88cb3faa643796a93e9d0e scap-security-guide-0.1.5.tar.gz
+3cd8d02a0550b8e384db86b5f558c1fb scap-security-guide-0.1.18.tar.gz
More information about the scm-commits
mailing list