[firstaidkit/f15] new version

Mon Oct 17 13:04:11 UTC 2011

commit e9bd07213671e8e6d382f215e7525a6b08281468
Author: Martin Sivak <msivak at redhat.com>
Date:   Mon Oct 17 15:03:11 2011 +0200

    new version

 .gitignore       |    1 +
 firstaidkit.spec |   65 ++++++++++++++++++++---------------------------------
 sources          |    2 +-
 3 files changed, 27 insertions(+), 41 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f64c3c6..8ab73fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ firstaidkit.desktop
 /firstaidkit-0.2.20.tar.gz
 /firstaidkit-0.3.0.tar.gz
 /firstaidkit-0.3.1.tar.gz
+/firstaidkit-0.3.2.tar.gz
diff --git a/firstaidkit.spec b/firstaidkit.spec
index 4b5325c..1ab4847 100644
--- a/firstaidkit.spec
+++ b/firstaidkit.spec
@@ -4,9 +4,9 @@
 %define debug_package %{nil}
 
 Name:           firstaidkit
-Version:        0.3.1
-Release:        1%{?dist}
-Summary:        System Rescue Tool
+Version:        0.3.2
+Release:        2%{?dist}
+Summary:        System analysis and rescue tool
 
 Group:          Applications/System
 License:        GPLv2+
@@ -28,6 +28,7 @@ BuildRequires:  python-setuptools-devel
 BuildRequires:  python-tools
 Requires:       newt
 Requires:       %{name}-engine
+Obsoletes:      %{name}-plugin-grub < %{version}
 
 %description
 A tool that automates simple and common system recovery tasks.
@@ -60,9 +61,6 @@ Requires:       %{name}-plugin-passwd
 Requires:       %{name}-plugin-freespace
 Requires:       %{name}-plugin-xserver
 Requires:       %{name}-plugin-openscap
-%ifnarch s390 s390x ppc64 ppc sparc
-Requires:       %{name}-plugin-grub
-%endif
 Requires:       %{name}-gui
 Requires:       %{name}-plugin-mdadm-conf
 Requires:       %{name}-plugin-key-recovery
@@ -126,21 +124,6 @@ BuildArch:      noarch
 This FirstAidKit plugin automates the recovery of the xserver
 configuration file xorg.conf.
 
-
-%ifnarch s390 s390x ppc64 ppc sparc
-%package plugin-grub
-Group:          Applications/System
-Summary:        FirstAidKit plugin to diagnose or repair the GRUB instalation
-Requires:       %{name} = %{version}-%{release}
-Requires:       dbus-python
-Requires:       grub
-Requires:       pyparted
-
-%description plugin-grub
-This FirstAidKit plugin automates the recovery from the GRUB bootloader problems.
-%endif
-
-
 %package plugin-mdadm-conf
 Group:          Applications/System
 Summary:        Firstaidkit plugin to diagnose software raid configuration file
@@ -202,20 +185,18 @@ packet.
 %{__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}
 
+#plugins arch independent and dependent
+%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins
+
 #examples
 %{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/examples
 %{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/examples
 
-#plugins arch independent and dependent
-%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins
-%{__install} -d $RPM_BUILD_ROOT%{libdir}/firstaidkit/plugins
-
 %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 %{__cp} -f plugins/freespace.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
 %{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 %{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 
@@ -278,13 +259,6 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/plugins/xserver.py*
 
-%ifnarch s390 s390x ppc64 ppc sparc
-%files plugin-grub
-%defattr(-,root,root,-)
-%{_libdir}/firstaidkit/plugins/grub/*
-%dir %{_libdir}/firstaidkit/plugins/grub
-%endif
-
 %files plugin-mdadm-conf
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/plugins/mdadm_conf.py*
@@ -295,6 +269,13 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 
 
 %changelog
+* Fri Oct 14 2011 Martin Sivak <msivak at redhat.com> - 0.3.2-2
+- Added Obsolete clause as Yum cannot handle updates with removal
+  Resolves: rhbz#738563
+
+* Wed Aug 03 2011 Martin Sivak <msivak at redhat.com> - 0.3.2-1
+- Removed GRUB plugin, it was a broken hack anyways
+
 * Wed Apr 20 2011 Martin Sivak <msivak at redhat.com> - 0.3.1-1
 - OpenSCAP plugin adapted to the updated OpenSCAP API
 - Big improvements to remote mode GUI usability
@@ -350,15 +331,19 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 * 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
 
-* Mon May 22 2010 Martin Sivak <msivak at redhat.com> - 0.2.11-2
-- Add menu icon
-  Resolves: rhbz#587903
-
-* Tue Mar 30 2010 Martin Sivak <msivak at redhat.com> - 0.2.11-1
+* Tue May 30 2010 Martin Sivak <msivak at redhat.com> - 0.2.11-1
 - Add missing files to configuration and docs
 - Use full sized buttons in text-mode firstaidkit-qs
   Resolves: rhbz#576110
 
+* Mon May 22 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-4
+- Add menu icon
+  Resolves: rhbz#587903
+
+* Mon Apr 27 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-3
+- Do not build debuginfo
+  Related: rhbz#564482
+
 * Mon Mar 29 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-2
 - Spec file cleanup
 
@@ -373,7 +358,7 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 
 * Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-6
 - use ifnarch for ackages section too
-  Related: rhbz#557202
+l  Related: rhbz#557202
 
 * Thu Jan 21 2010 Martin Sivak <msivak at redhat.com> - 0.2.8-5
 - ExcludeArch is global directive, use ifnarch instead
diff --git a/sources b/sources
index f7c0cdb..3a4c4b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55e4fb91c57da5b96707e6760b87a95e  firstaidkit-0.3.1.tar.gz
+48006137b8967ecddeec904f429b4163  firstaidkit-0.3.2.tar.gz
