[scap-security-guide/epel7] Rebase the RHEL part of ssg to the latest upstream version

Šimon Lukašík isimluk at fedoraproject.org
Mon May 12 12:13:57 UTC 2014


commit f54a5f815730cb016b19e6bad0d1f8fd769b5ba7
Author: Simon Lukasik <slukasik at redhat.com>
Date:   Mon May 12 13:44:11 2014 +0200

    Rebase the RHEL part of ssg to the latest upstream version

 .gitignore               |    1 +
 scap-security-guide.spec |    9 ++++++---
 sources                  |    3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cb2664b..af89ff5 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.17.tar.gz
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 4e83504..7eb30f2 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.17
 
 Name:		scap-security-guide
 Version:	0.1.%{fedorassgversion}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 Group:		Applications/System
 License:	Public Domain
@@ -76,10 +76,13 @@ popd
 %files
 %{_datadir}/xml/scap
 %lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
-%doc scap-security-guide-0.1-16/RHEL/7/LICENSE scap-security-guide-0.1-16/RHEL/7/output/rhel7-guide.html
+%doc %{name}-%{rhelssgsource}/RHEL/7/LICENSE %{name}-%{rhelssgsource}/RHEL/7/output/rhel7-guide.html
 
 
 %changelog
+* 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
+
 * Fri Mar 14 2014 Šimon Lukašík <slukasik at redhat.com> - 0.1.5-2
 - Distribute Red Hat Enterprise Linux 7 Guide instead of Fedora version
 
diff --git a/sources b/sources
index adad3e1..c00f41a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c4487f3c77067bb324b82b99dc33d476  scap-security-guide-0.1-16.tar.gz
+cc3b03c38126df830fffc0f39dce5a65  scap-security-guide-0.1.17.tar.gz
+01afab523a88cb3faa643796a93e9d0e  scap-security-guide-0.1.5.tar.gz


More information about the scm-commits mailing list