[scap-workbench] Updated to 0.8.3
Martin Preisler
mpreisle at fedoraproject.org
Fri Nov 29 11:33:12 UTC 2013
commit 8a366239daa33f2641883808d7172cc87c97b074
Author: Martin Preisler <mpreisle at redhat.com>
Date: Fri Nov 29 12:32:40 2013 +0100
Updated to 0.8.3
.gitignore | 1 +
scap-workbench.spec | 15 +++++++++++----
sources | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5811080..a8cf04e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/scap-workbench-0.8.0.tar.bz2
/scap-workbench-0.8.1.tar.bz2
/scap-workbench-0.8.2.tar.bz2
+/scap-workbench-0.8.3.tar.bz2
diff --git a/scap-workbench.spec b/scap-workbench.spec
index 1dee1ea..46fed4b 100644
--- a/scap-workbench.spec
+++ b/scap-workbench.spec
@@ -3,9 +3,11 @@
%{?scl:%global _scl_prefix /opt/scap-testing}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: %{?scl_prefix}scap-workbench
-Version: 0.8.2
-Release: 2%{?dist}
+Version: 0.8.3
+Release: 1%{?dist}
Summary: Scanning, tailoring, editing and validation tool for SCAP content
License: GPLv3+
@@ -34,7 +36,7 @@ content. The tool is based on OpenSCAP library.
%setup -q -n %{pkg_name}-%{version}
%build
-%cmake .
+%cmake -D CMAKE_INSTALL_DOCDIR=%{_pkgdocdir} .
make %{?_smp_mflags}
%install
@@ -42,11 +44,16 @@ make install DESTDIR=%{buildroot}
%files
%{_bindir}/scap-workbench
-%{_mandir}/man8/scap-workbench.8.gz
%{_datadir}/applications/scap-workbench.desktop
%{_datadir}/pixmaps/scap-workbench.png
+%doc %{_mandir}/man8/scap-workbench.8.gz
+%doc %{_pkgdocdir}/user_manual.html
%changelog
+* Fri Nov 29 2013 Martin Preisler <mpreisle at redhat.com> 0.8.3-1
+- Updated to new version
+- Added measures to deal with unversioned pkgdocdir in Fedora 20+
+
* Mon Nov 18 2013 Martin Preisler <mpreisle at redhat.com> 0.8.2-2
- Removed the openscap detection workaround, it is no longer needed with openscap 0.9.13
diff --git a/sources b/sources
index 97649a9..451475d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5362273e78bc1071aa05e46fc3c82aa9 scap-workbench-0.8.2.tar.bz2
+9317802b6940483ff38712caa1820f29 scap-workbench-0.8.3.tar.bz2
More information about the scm-commits
mailing list