RHEL6 import

1 files changed, 141 insertions, 4 deletions

diff --git a/firstaidkit.spec b/firstaidkit.spec
index ce4de0b..fa7a95d 100644
--- a/firstaidkit.spec
+++ b/firstaidkit.spec
@@ -4,7 +4,7 @@
 
 Name:           firstaidkit
 Version:        0.2.8
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
@@ -83,17 +83,18 @@ 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 installation
+Summary:        FirstAidKit plugin to diagnose or repair the GRUB instalation
 Requires:       %{name} = %{version}-%{release}
 Requires:       dbus-python
 Requires:       grub
 Requires:       pyparted
-ExcludeArch:    ppc ppc64 s390 s390x sparc
 
 %description plugin-grub
 This FirstAidKit plugin automates the recovery from the GRUB bootloader problems.
+%endif
 
 
 %package plugin-mdadm-conf
@@ -226,9 +227,11 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 %files plugin-xserver
 %{_libdir}/firstaidkit/plugins/xserver.py*
 
+%ifnarch s390 s390x ppc64 ppc sparc
 %files plugin-grub
 %{_libdir}/firstaidkit/plugins/grub/*
 %dir %{_libdir}/firstaidkit/plugins/grub/*
+%endif
 
 %files plugin-mdadm-conf
 %{_libdir}/firstaidkit/plugins/mdadm_conf.py*
@@ -242,4 +245,138 @@ desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applic
 #
 #%files plugin-rpm
 #%{_libdir}/firstaidkit/plugins/rpm_lowlevel/*
-#%{_libdir}/firstaidkit/plugins/rpm/*
+#
+
+%changelog
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-6
+- use ifnarch for ackages section too
+  Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-5
+- ExcludeArch is global directive, use ifnarch instead
+  Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-4
+- Error in .spec release line
+  Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-3
+- wrong Source0 in spec file
+  Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-2
+- we need new version name, because it is not possible to retag
+  Related: rhbz#557202
+
+* Thu Jan 21 2010 Martin Sivak <msivak@redhat.com> - 0.2.8-1
+- Set different Url in spec file
+- Make package arch specific
+  Resolves: rhbz#557202
+
+* Tue Sep 29 2009 Martin Sivak <msivak@redhat.com> - 0.2.7-1
+- Make the dialog in whiptail bigger, so it looks nicer
+
+* Tue Sep 22 2009 Martin Sivak <msivak@redhat.com> - 0.2.6-1
+- Use whiptail instead of dialog for firstaidkit-qs
+
+* Wed Aug 19 2009 Joel Granados <jgranado@redhat.com> - 0.2.5-1
+- Docs updated, new artwork
+
+* Tue Aug 04 2009 Martin Sivak <msivak@redhat.com> - 0.2.4-1
+- Fix temp file generation in firstaidkit-qs
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Martin Sivak <msivak@redhat.com> - 0.2.3-4
+- Simple enhancement to the API (inreplyto)
+
+* Mon Jul 13 2009 Martin Sivak <msivak@redhat.com> - 0.2.3-3
+- Add timeout to firstaidkit-qs
+
+* Mon Jul 13 2009 Martin Sivak <msivak@redhat.com> - 0.2.3-2
+- Fixed firstaidkit-qs included..
+
+* Mon Jul 13 2009 Martin Sivak <msivak@redhat.com> - 0.2.3-1
+- Add firstaidkit-qs script
+- Do not build undelparts plugin since we ignore it anyways
+
+* Mon Jun 29 2009 Martin Sivak <msivak@redhat.com> - 0.2.2-10
+- Exclude grub plugin from s390 archs
+
+* Thu Mar 19 2009 Joel Granados <jgranado@redhat.com> - 0.2.2-9
+- Track the grub plugin directory.
+
+* Thu Mar 19 2009 Joel Granados <jgranado@redhat.com> - 0.2.2-8
+- Track the sysconfig directory.
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jan 05 2009 Joel Granados <jgranado@redhat.com> - 0.2.2-6
+- The ppc and ppc64 arch do not handle grub as their bootloader.
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.2.2-5
+- Rebuild for Python 2.6
+
+* Sun Nov 30 2008 Joel Granados <jgranado@redhat.com> - 0.2.2-4
+- Include the firstaidkit directories in the package.
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.2.2-3
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.2.2-2
+- Rebuild for Python 2.6
+
+* Thu Nov 20 2008 Joel Granados <jgranado@redhat.com> 0.2.2-1
+- Update to new version.
+
+* Thu Aug 28 2008 Michael Schwendt <mschwendt@fedoraproject.org> 0.2.1-2
+- Include unowned directories.
+
+* Tue Jul 15 2008 Joel Granados <jgranado@redhat.com> 0.2.1-1
+- New version
+- Brings in a new plugin.
+
+* Tue Jun 3 2008 Joel Granados <jgranado@redhat.com> 0.2.0-1
+- New upstream version
+- Fixup the spec file
+- Erase the unneeded patch files
+
+* Thu Mar 13 2008 Joel Granados <jgranado@redhat.com> 0.1.1-4
+- Fix dependency with passwd plugin
+
+* Tue Mar 11 2008 Joel Granados <jgranado@redhat.com> 0.1.1-3
+- Rebuild
+
+* Tue Mar 11 2008 Joel Granados <jgranado@redhat.com> 0.1.1-2
+- Fix dependency problem for ppc64
+- Patch a syntax error
+
+* Mon Mar 10 2008 Joel Granados <jgranado@redhat.com> 0.1.1-1
+- New version
+
+* Wed Jan 09 2008 Joel Granados <jgranado@redhat.com> 0.1.0-6
+- Put examples under the firstaidkit-plugins dir
+- Create a firstaidkit-plugin-all package
+
+* Tue Jan 08 2008 Joel Granados <jgranado@redhat.com> 0.1.0-5
+- Leave just the firstaidkit and firstaidkit-devel pacages.
+
+* Mon Jan 07 2008 Joel Granados <jgranado@redhat.com> 0.1.0-4
+- Create firstaidkit dummy package
+- Create firstaidkit-pluginsystem subpackage
+- Create firstaidkit-devel subpackage
+- Bump the release tag
+
+* Fri Jan 04 2008 Joel Granados <jgranado@redhat.com> 0.1.0-3
+- Change the License variable
+- Fix man page being executable
+
+* Fri Jan 04 2008 Joel Granados <jgranado@redhat.com> 0.1.0-2
+- Include python-setuptools-devel in the BuildRequires
+- Added manpage stuff in the spec file
+
+* Wed Jan 02 2008 Joel Granados <jgranado@redhat.com> 0.1.0-1
+- Initial spec
+%{_libdir}/firstaidkit/plugins/rpm/*