[firstaidkit] new version

[Martin Sivák]

commit 50126fbba02590aa4b1187a059e30b93f50f96db
Author: Martin Sivak <msivak at redhat.com>
Date:   Mon Aug 30 15:26:14 2010 +0200

    new version

 .gitignore       |    1 +
 firstaidkit.spec |   36 +++++++++++++++++++++++++++++++-----
 sources          |    3 +--
 3 files changed, 33 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c17f9cd..6d4d03a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 firstaidkit-0.2.11.tar.gz
 firstaidkit.desktop
+/firstaidkit-0.2.13.tar.gz
diff --git a/firstaidkit.spec b/firstaidkit.spec
index 5e9d9c1..3286943 100644
--- a/firstaidkit.spec
+++ b/firstaidkit.spec
@@ -4,8 +4,8 @@
 %define debug_package %{nil}
 
 Name:           firstaidkit
-Version:        0.2.11
-Release:        3%{?dist}
+Version:        0.2.13
+Release:        1%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
@@ -25,6 +25,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  desktop-file-utils
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
+BuildRequires:  python-tools
 Requires:       newt
 Requires:       %{name}-engine
 
@@ -57,6 +58,7 @@ Summary:        All firstaidkit plugins, and the gui
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-plugin-passwd
 Requires:       %{name}-plugin-xserver
+Requires:       %{name}-plugin-openscap
 %ifnarch s390 s390x ppc64 ppc sparc
 Requires:       %{name}-plugin-grub
 %endif
@@ -93,6 +95,16 @@ BuildArch:      noarch
 This FirstAidKit plugin automates the recovery of the root system
 password.
 
+%package plugin-openscap
+Group:          Applications/System
+Summary:        OpenSCAP plugin for FirstAidKit
+Requires:       %{name} = %{version}-%{release}
+Requires:       openscap >= 0.5.12-1
+BuildArch:      noarch
+
+%description plugin-openscap
+This FirstAidKit plugin interfaces the OpenSCAP library, which can be used to perform a security/configuration audit of running machine.
+
 
 %package plugin-xserver
 Group:          Applications/System
@@ -144,8 +156,6 @@ packet.
 
 %prep
 %setup -q
-./test
-
 
 %build
 %{__python} setup.py build
@@ -156,9 +166,12 @@ packet.
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
+#languages
+%find_lang %{name}
+
 #docs
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-%{__install} -d $RPM_BUILD_ROOT%{_datadir}/doc/%name-%version
+%{__install} -d $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 %{__install} -p doc/firstaidkit-plugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 %{__install} -p COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%name-%version/COPYING
 
@@ -172,6 +185,7 @@ packet.
 %{__install} -p frontend/*.py  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
 %{__install} -p frontend/*.glade  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
 %{__install} -p frontend/*.gladep  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
+%{__install} -p frontend/*.xml $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
 %{__install} -d $RPM_BUILD_ROOT/usr/share/icons
 %{__install} -p images/FAK-bandaid.png $RPM_BUILD_ROOT/usr/share/icons/firstaidkit.png
 desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
@@ -185,6 +199,7 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 %{__install} -d $RPM_BUILD_ROOT%{libdir}/firstaidkit/plugins
 
 %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
+%{__cp} -f plugins/openscap_plugin.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 %{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 %{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
 %{__cp} -f plugins/grub/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
@@ -219,6 +234,7 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/frontend/*.py*
 /usr/share/firstaidkit/frontend/*.glade
+/usr/share/firstaidkit/frontend/*.xml
 /usr/share/firstaidkit/frontend/*.gladep
 /usr/share/icons/*.png
 %{_datadir}/applications/*.desktop
@@ -236,6 +252,10 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/plugins/passwd.py*
 
+%files plugin-openscap
+%defattr(-,root,root,-)
+/usr/share/firstaidkit/plugins/openscap_plugin.py*
+
 %files plugin-xserver
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/plugins/xserver.py*
@@ -257,6 +277,12 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 
 
 %changelog
+* Mon Aug 30 2010 Martin Sivak <msivak at redhat.com> - 0.2.13-1
+- Improve Config question and integrate it into OpenSCAP
+
+* Thu Aug 26 2010 Martin Sivak <msivak at redhat.com> - 0.2.12-1
+- Add OpenSCAP plugin
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.2.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index 418e5c9..42187ec 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-2aed9b7fe2f224813ba6b9c5df4feb5b  firstaidkit-0.2.11.tar.gz
-86175ac67bc3ad8cfef9c0731b69feca  firstaidkit.desktop
+1618c8ad5d8f339d25f532d191e12735  firstaidkit-0.2.13.tar.gz