rpms/firstaidkit/devel .cvsignore, 1.6, 1.7 firstaidkit.spec, 1.22, 1.23 sources, 1.6, 1.7
Martin Sivák
msivak at fedoraproject.org
Mon Jul 13 11:48:55 UTC 2009
Author: msivak
Update of /cvs/extras/rpms/firstaidkit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27412
Modified Files:
.cvsignore firstaidkit.spec sources
Log Message:
New version
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 27 Nov 2008 13:42:58 -0000 1.6
+++ .cvsignore 13 Jul 2009 11:48:54 -0000 1.7
@@ -1 +1 @@
-firstaidkit-0.2.2.tar.bz2
+firstaidkit-0.2.3.tar.bz2
Index: firstaidkit.spec
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- firstaidkit.spec 29 Jun 2009 11:04:07 -0000 1.22
+++ firstaidkit.spec 13 Jul 2009 11:48:54 -0000 1.23
@@ -3,8 +3,8 @@
%define _unpackaged_files_terminate_build 0
Name: firstaidkit
-Version: 0.2.2
-Release: 10%{?dist}
+Version: 0.2.3
+Release: 1%{?dist}
Summary: System Rescue Tool
Group: Applications/System
@@ -18,6 +18,7 @@ BuildRequires: desktop-file-utils
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
BuildArch: noarch
+Requires: dialog
%description
A tool that automates simple and common system recovery tasks.
@@ -36,19 +37,31 @@ Provides the examples and requires first
Group: Applications/System
Summary: All firstaidkit plugins, and the gui
Requires: %{name} = %{version}-%{release}
-%ifnarch s390 s390x ppc64 ppc
-Requires: %{name}-plugin-grub
-%endif
Requires: %{name}-plugin-passwd
Requires: %{name}-plugin-xserver
-Requires: %{name}-plugin-mdadm-conf
+%ifnarch s390 s390x ppc64 ppc sparc
+Requires: %{name}-plugin-grub
+%endif
Requires: %{name}-gui
+Requires: %{name}-plugin-mdadm-conf
+#Requires: %{name}-plugin-undelete-partitions
+#Requires: %{name}-plugin-rpm
+
%description plugin-all
This package provides all the necessary firstaidkit plugins. It
probes the system and according to what it finds, it installs the
needed firstaidkit plugins.
+%package gui
+Group: Applications/System
+Summary: FirstAidKit GUI
+Requires: %{name} = %{version}-%{release}
+Requires: pygtk2, pygtk2-libglade
+
+%description gui
+This package contains the Gtk based FirstAidKit GUI
+
%package plugin-passwd
Group: Applications/System
@@ -69,15 +82,6 @@ Requires: %{name} = %{version}-%{r
This FirstAidKit plugin automates the recovery of the xserver
configuration file xorg.conf.
-%package plugin-mdadm-conf
-Group: Applications/System
-Summary: Firstaidkit plugin to diagnose software raid configuration file
-Requires: %{name} = %{version}-%{release}
-Requires: mdadm
-
-%description plugin-mdadm-conf
-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
@@ -86,20 +90,42 @@ Requires: %{name} = %{version}-%{r
Requires: dbus-python
Requires: grub
Requires: pyparted
-ExcludeArch: ppc ppc64 s390 s390x
+ExcludeArch: ppc ppc64 s390 s390x sparc
%description plugin-grub
This FirstAidKit plugin automates the recovery from the GRUB bootloader problems.
-%package gui
+%package plugin-mdadm-conf
Group: Applications/System
-Summary: FirstAidKit GUI
+Summary: Firstaidkit plugin to diagnose software raid configuration file
Requires: %{name} = %{version}-%{release}
-Requires: pygtk2, pygtk2-libglade
+Requires: mdadm
-%description gui
-This package contains the Gtk based FirstAidKit GUI
+%description plugin-mdadm-conf
+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-rpm
+#Group: Applications/System
+#Summary: FirstAidKit plugin to diagnose or repair the RPM packaging system
+#Requires: %{name} = %{version}-%{release}
+#Requires: rpm, rpm-python
+#
+#%description plugin-rpm
+#This FirstAidKit plugin automates the tasks related to RPM problems.
+#For example: corrupted database or important system packages missing.
+#
+#%package plugin-undelete-partitions
+#Group: Applications/System
+#Summary: FirstAidKit plugin to recover erased partitions
+#BuildRequires: python-devel, parted-devel, pkgconfig
+#Requires: %{name} = %{version}-%{release}
+#Requires: parted
+#
+#%description plugin-undelete-partitions
+#This FirstAidKit plugin automates the recovery of erased partitions.
%prep
@@ -109,7 +135,7 @@ This package contains the Gtk based Firs
%build
%{__python} setup.py build
-%{__make} about
+%{__make} build
%install
@@ -141,21 +167,26 @@ desktop-file-install --vendor="fedora" -
#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
-
+%{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts
+#%{__cp} -f plugins/undelparts/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/undelparts/
+#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm
+#%{__cp} -f plugins/rpm/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm/
+#%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm_lowlevel
+#%{__cp} -f plugins/rpm_lowlevel/*.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/rpm_lowlevel/
%clean
%{__rm} -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,-)
# For noarch packages: sitelib
%{python_sitelib}/pyfirstaidkit
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
%{_bindir}/firstaidkit
+%{_bindir}/firstaidkit-qs
%dir %{_bindir}/firstaidkit
%{_bindir}/firstaidkitrevert
%config(noreplace) %{_sysconfdir}/firstaidkit/firstaidkit.conf
@@ -165,7 +196,6 @@ desktop-file-install --vendor="fedora" -
%dir %{_libdir}/firstaidkit
%dir %{_libdir}/firstaidkit/plugins
%dir %{_datadir}/doc/%name-%version
-%dir %{_sysconfdir}/firstaidkit
%files gui
%{_libdir}/firstaidkit/frontend/*.py*
@@ -186,14 +216,26 @@ desktop-file-install --vendor="fedora" -
%files plugin-xserver
%{_libdir}/firstaidkit/plugins/xserver.py*
+%files plugin-grub
+%{_libdir}/firstaidkit/plugins/grub/*
+%dir %{_libdir}/firstaidkit/plugins/grub/*
+
%files plugin-mdadm-conf
%{_libdir}/firstaidkit/plugins/mdadm_conf.py*
-%files plugin-grub
-%{_libdir}/firstaidkit/plugins/grub/*
-%dir %{_libdir}/firstaidkit/plugins/grub
+#%files plugin-undelete-partitions
+#%{_libdir}/firstaidkit/plugins/undelparts/*.py*
+#%{_libdir}/firstaidkit/plugins/undelparts/*.so
+#
+#%files plugin-rpm
+#%{_libdir}/firstaidkit/plugins/rpm_lowlevel/*
+#%{_libdir}/firstaidkit/plugins/rpm/*
%changelog
+* Mon Jul 13 2009 Martin Sivak <msivak at 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 at redhat.com> - 0.2.2-10
- Exclude grub plugin from s390 archs
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firstaidkit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 27 Nov 2008 13:42:58 -0000 1.6
+++ sources 13 Jul 2009 11:48:54 -0000 1.7
@@ -1 +1 @@
-039e9a1e1837cbf741359429190ce5e0 firstaidkit-0.2.2.tar.bz2
+0465757e71024cc415b9ac9e1cea80bb firstaidkit-0.2.3.tar.bz2
More information about the fedora-extras-commits
mailing list