rpms/firstaidkit/devel .cvsignore, 1.2, 1.3 firstaidkit.spec, 1.1, 1.2 sources, 1.2, 1.3
Joel Andres Granados Moreno (jgranado)
fedora-extras-commits at redhat.com
Mon Mar 10 20:34:27 UTC 2008
Author: jgranado
Update of /cvs/pkgs/rpms/firstaidkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29972
Modified Files:
.cvsignore firstaidkit.spec sources
Log Message:
update to version 0.1.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 15 Jan 2008 08:32:28 -0000 1.2
+++ .cvsignore 10 Mar 2008 20:33:53 -0000 1.3
@@ -1 +1 @@
-firstaidkit-0.1.0.tar.bz2
+firstaidkit-0.1.1.tar.bz2
Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firstaidkit.spec 15 Jan 2008 08:32:28 -0000 1.1
+++ firstaidkit.spec 10 Mar 2008 20:33:53 -0000 1.2
@@ -1,8 +1,10 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+#I don't want the unpackaged file check
+%define _unpackaged_files_terminate_build 0
Name: firstaidkit
-Version: 0.1.0
-Release: 6%{?dist}
+Version: 0.1.1
+Release: 1%{?dist}
Summary: System Rescue Tool
Group: Applications/System
@@ -12,58 +14,83 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
-# Maybe its just enough with the python-setuptools-devel. Lets use both for now.
+# Take this away in the future. when f7 is gone.
%if 0%{?fedora} >= 8
BuildRequires: python-setuptools-devel
%else
BuildRequires: python-setuptools
%endif
-
BuildArch: noarch
+%description
+A tool that automates simple and common system recovery tasks.
+
%package devel
Group: Applications/System
Summary: Devel package for firstaidkit
Requires: %{name} = %{version}-%{release}
+%description devel
+Provides the examples and requires firstaidkit without plugins.
+
+
%package plugin-all
Group: Applications/System
Summary: All firstaidkit plugins
-#
-# Since there are no plugins yet, this section only has firstaidkit as requires.
-#
Requires: %{name} = %{version}-%{release}
-
-%description
-A tool that automates simple and common system recovery tasks.
-
-%description devel
-Provides the examples and requires firstaidkit without plugins.
-
%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 plugin-undelete-partitions
+Group: Applications/System
+Summary: FirstAidKit plugin to recover erased partitions
+BuildRequires: python-devel, parted-devel, pkgconfig
+Requires: parted
+
+%description plugin-undelete-partitions
+This FirstAidKit plugin automates the recovery of erased partitions.
+
+
+%package plugin-passwd
+Group: Applications/System
+Summary: FirstAidKit plugin to manipulate passwd system
+
+%description plugin-passwd
+This plugin provides operations for convenient manipulation
+with the password system.
+
+
%prep
%setup -q
%build
%{__python} setup.py build
+%{__make} subdirs
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
-%{__install} -p doc/fakplugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples
+#docs
+%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_sysconfdir}
+%{__install} -p doc/fakplugin.1 doc/firstaidkit.1 $RPM_BUILD_ROOT%{_mandir}/man1
+#examples
%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples
+%{__mv} -f plugins/plugin_examples $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples
+#configuration
+%{__install} -p etc/firstaidkit.conf $RPM_BUILD_ROOT%{_sysconfdir}
+
+#plugins
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions
+%{__cp} -f plugins/plugin_undelete_partitions/{*.py,_undelpart.so} $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/
+%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/
-%{__cp} -rfp plugins/* $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/examples
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -76,6 +103,7 @@
%{python_sitelib}/pyfirstaidkit
%{python_sitelib}/%{name}-%{version}-py2.5.egg-info
%{_bindir}/firstaidkit
+%{_sysconfdir}/firstaidkit.conf
%attr(0644,root,root) %{_mandir}/man1/firstaidkit.1.gz
%files devel
@@ -84,7 +112,17 @@
%files plugin-all
+%files plugin-undelete-partitions
+%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.py
+%{_libdir}/firstaidkit-plugins/plugin_undelete_partitions/*.so
+
+%files plugin-passwd
+%{_libdir}/firstaidkit-plugins/passwd.py
+
%Changelog
+* Mon Mar 10 2008 Joel Granados <jgranado at redhat.com> 0.1.1-1
+- new version
+
* Wed Jan 09 2008 Joel Granados <jgranado at redhat.com> 0.1.0-6
- Put examples under the firstaidkit-plugins dir
- Create a firstaidkit-plugin-all package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 15 Jan 2008 08:32:28 -0000 1.2
+++ sources 10 Mar 2008 20:33:53 -0000 1.3
@@ -1 +1 @@
-7a4e783e4c95d875cb8b15d2d119dfc6 firstaidkit-0.1.0.tar.bz2
+4c02212aed61ba72d979401995ac04a5 firstaidkit-0.1.1.tar.bz2
More information about the fedora-extras-commits
mailing list