rpms/firstaidkit/devel .cvsignore, 1.5, 1.6 firstaidkit.spec, 1.10, 1.11 sources, 1.5, 1.6

Thu Nov 27 13:43:29 UTC 2008

Author: jgranado

Update of /cvs/pkgs/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1480

Modified Files:
	.cvsignore firstaidkit.spec sources 
Log Message:
New version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	15 Jul 2008 16:10:57 -0000	1.5
+++ .cvsignore	27 Nov 2008 13:42:58 -0000	1.6
@@ -1 +1 @@
-firstaidkit-0.2.1.tar.bz2
+firstaidkit-0.2.2.tar.bz2


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firstaidkit.spec	28 Aug 2008 21:13:26 -0000	1.10
+++ firstaidkit.spec	27 Nov 2008 13:42:58 -0000	1.11
@@ -3,23 +3,20 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.2.1
-Release:        2%{?dist}
+Version:        0.2.2
+Release:        1%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://fedorahosted.org/firstaidkit
 Source0:        %{name}-%{version}.tar.bz2
+Source3:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  desktop-file-utils
 BuildRequires:  python-devel
-# Take this away in the future. when f7 is gone.
-%if 0%{?fedora} >= 8
-BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
+BuildRequires:  python-setuptools-devel
 BuildArch:      noarch
 
 %description
@@ -39,6 +36,7 @@
 Group:          Applications/System
 Summary:        All firstaidkit plugins, and the gui
 Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-plugin-grub
 Requires:       %{name}-plugin-passwd
 Requires:       %{name}-plugin-xserver
 Requires:       %{name}-plugin-mdadm-conf
@@ -64,7 +62,6 @@
 Group:          Applications/System
 Summary:        FirstAidKit plugin to recover xserver configuration files
 Requires:       %{name} = %{version}-%{release}
-Requires:       rhpl, rhpxl
 
 %description plugin-xserver
 This FirstAidKit plugin automates the recovery of the xserver
@@ -80,6 +77,18 @@
 This plugin will assess the validity and existence of the mdadm.conf file.
 The file will get replaced if any inconsistencies are found.
 
+%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.
+
+
 %package gui
 Group:          Applications/System
 Summary:        FirstAidKit GUI
@@ -92,17 +101,12 @@
 
 %prep
 %setup -q
-#execute the testsuite
 ./test
 
-#generate the about file with version and license path
-echo "[about]" >> etc/firstaidkit/about
-echo "version=%{version}" >> etc/firstaidkit/about
-echo "copying=%{_docdir}/%{name}-%{version}/COPYING" >> etc/firstaidkit/about
-
 
 %build
 %{__python} setup.py build
+%{__make} build
 
 
 %install
@@ -111,7 +115,9 @@
 
 #docs
 %{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
+%{__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
 
 #examples
 %{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/examples
@@ -127,11 +133,14 @@
 %{__install} -p frontend/*.py  $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
 %{__install} -p frontend/*.glade  $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
 %{__install} -p frontend/*.gladep  $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend/
+desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
 
 #plugins
 %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
 %{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
 %{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
+%{__cp} -f plugins/grub/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/grub
 
 
 %clean
@@ -144,18 +153,24 @@
 %{python_sitelib}/pyfirstaidkit
 %{python_sitelib}/%{name}-%{version}-py2.5.egg-info
 %{_bindir}/firstaidkit
-%dir %{_sysconfdir}/firstaidkit
-%{_sysconfdir}/firstaidkit/firstaidkit.conf
-%{_sysconfdir}/firstaidkit/about
+%{_bindir}/firstaidkitrevert
+%config(noreplace) %{_sysconfdir}/firstaidkit/firstaidkit.conf
+%config(noreplace) %{_sysconfdir}/firstaidkit/about
 %attr(0644,root,root) %{_mandir}/man1/firstaidkit.1.gz
-%dir %{_libdir}/firstaidkit
-%dir %{_libdir}/firstaidkit/plugins
+%attr(0644,root,root) %{_datadir}/doc/%name-%version/COPYING
+#%dir %{_libdir}/firstaidkit
+#%dir %{_libdir}/firstaidkit/plugins
 
 %files gui
-%dir %{_libdir}/firstaidkit/frontend
 %{_libdir}/firstaidkit/frontend/*.py*
 %{_libdir}/firstaidkit/frontend/*.glade
 %{_libdir}/firstaidkit/frontend/*.gladep
+%{_datadir}/applications/*.desktop
+
+#%dir %{_libdir}/firstaidkit/frontend
+#%{_libdir}/firstaidkit/frontend/*.py*
+#%{_libdir}/firstaidkit/frontend/*.glade
+#%{_libdir}/firstaidkit/frontend/*.gladep
 
 %files devel
 %{_libdir}/firstaidkit/plugins/examples
@@ -172,11 +187,17 @@
 %files plugin-mdadm-conf
 %{_libdir}/firstaidkit/plugins/mdadm_conf.py*
 
+%files plugin-grub
+%{_libdir}/firstaidkit/plugins/grub/*
+
 %changelog
+* Thu Nov 20 2008 Joel Granados <jgranado at redhat.com> 0.2.2-1
+- Update to new version.
+
 * Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> 0.2.1-2
 - Include unowned directories.
 
-* Tue Jul 15 2008 Joel Granados <jgranados at redhat.com> 0.2.1-1
+* Tue Jul 15 2008 Joel Granados <jgranado at redhat.com> 0.2.1-1
 - New version
 - Brings in a new plugin.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jul 2008 16:10:57 -0000	1.5
+++ sources	27 Nov 2008 13:42:58 -0000	1.6
@@ -1 +1 @@
-8d602e5047981bce4c86c1598abc63e0  firstaidkit-0.2.1.tar.bz2
+039e9a1e1837cbf741359429190ce5e0  firstaidkit-0.2.2.tar.bz2


