- Update to latest upstream SCAP-Security-Guide-0.1.30 release:
https://github.com/OpenSCAP/scap-security-guide/releases/tag/v0.1.30 - Drop shell library for remediation functions since it is not required starting from 0.1.30 release any more
This commit is contained in:
parent
7ab0b3e30b
commit
3f797b190b
1
.gitignore
vendored
1
.gitignore
vendored
@ -15,3 +15,4 @@
|
|||||||
/scap-security-guide-0.1.29.tar.gz
|
/scap-security-guide-0.1.29.tar.gz
|
||||||
/0.1.29.tar.gz
|
/0.1.29.tar.gz
|
||||||
/v0.1.29.tar.gz
|
/v0.1.29.tar.gz
|
||||||
|
/v0.1.30.tar.gz
|
||||||
|
@ -0,0 +1,10 @@
|
|||||||
|
--- scap-security-guide-0.1.30/Makefile.orig 2016-06-27 11:44:37.622873972 +0200
|
||||||
|
+++ scap-security-guide-0.1.30/Makefile 2016-06-27 11:44:54.807223610 +0200
|
||||||
|
@@ -248,7 +248,6 @@ install: dist
|
||||||
|
install -m 0644 Fedora/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
|
||||||
|
install -m 0644 Fedora/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
|
||||||
|
install -m 0644 RHEL/6/dist/content/* $(PREFIX)/$(DATADIR)/xml/scap/ssg/content/
|
||||||
|
- install -m 0644 shared/remediations/bash/templates/remediation_functions $(PREFIX)/$(DATADIR)/scap-security-guide/
|
||||||
|
install -m 0644 RHEL/6/kickstart/*-ks.cfg $(PREFIX)/$(DATADIR)/scap-security-guide/kickstart
|
||||||
|
install -m 0644 RHEL/7/kickstart/*-ks.cfg $(PREFIX)/$(DATADIR)/scap-security-guide/kickstart
|
||||||
|
install -m 0644 RHEL/6/dist/guide/* $(PREFIX)/$(DOCDIR)/scap-security-guide/guides
|
@ -6,13 +6,14 @@
|
|||||||
# this one).
|
# this one).
|
||||||
|
|
||||||
Name: scap-security-guide
|
Name: scap-security-guide
|
||||||
Version: 0.1.29
|
Version: 0.1.30
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Security guidance and baselines in SCAP formats
|
Summary: Security guidance and baselines in SCAP formats
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
URL: https://fedorahosted.org/scap-security-guide/
|
URL: https://github.com/OpenSCAP/scap-security-guide/
|
||||||
Source0: https://github.com/OpenSCAP/scap-security-guide/archive/v%{version}.tar.gz
|
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
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: libxslt, expat, python
|
BuildRequires: libxslt, expat, python
|
||||||
BuildRequires: python-lxml
|
BuildRequires: python-lxml
|
||||||
@ -46,6 +47,8 @@ present in %{name} package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -D -n %{name}-%{version}
|
%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
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} dist
|
make %{?_smp_mflags} dist
|
||||||
@ -66,7 +69,7 @@ install -m 0644 LICENSE %{buildroot}/%{_docdir}/%{name}
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%{_datadir}/xml/scap
|
%{_datadir}/xml/scap
|
||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}/kickstart
|
||||||
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
|
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
|
||||||
%doc %{_docdir}/%{name}/LICENSE
|
%doc %{_docdir}/%{name}/LICENSE
|
||||||
%doc %{_docdir}/%{name}/README.md
|
%doc %{_docdir}/%{name}/README.md
|
||||||
@ -75,6 +78,12 @@ install -m 0644 LICENSE %{buildroot}/%{_docdir}/%{name}
|
|||||||
%doc %{_docdir}/%{name}/guides/*.html
|
%doc %{_docdir}/%{name}/guides/*.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
- Drop shell library for remediation functions since it is not required
|
||||||
|
starting from 0.1.30 release any more
|
||||||
|
|
||||||
* Thu May 05 2016 Jan iankko Lieskovsky <jlieskov@redhat.com> - 0.1.29-1
|
* Thu May 05 2016 Jan iankko Lieskovsky <jlieskov@redhat.com> - 0.1.29-1
|
||||||
- Update to latest upstream SCAP-Security-Guide-0.1.29 release:
|
- Update to latest upstream SCAP-Security-Guide-0.1.29 release:
|
||||||
https://github.com/OpenSCAP/scap-security-guide/releases/tag/v0.1.29
|
https://github.com/OpenSCAP/scap-security-guide/releases/tag/v0.1.29
|
||||||
|
Loading…
Reference in New Issue
Block a user