rpms/firstaidkit/devel firstaidkit-0.1.1-syntax-error.patch, NONE, 1.1 firstaidkit.spec, 1.2, 1.3

Joel Andres Granados Moreno (jgranado) fedora-extras-commits at redhat.com
Tue Mar 11 14:39:06 UTC 2008


Author: jgranado

Update of /cvs/pkgs/rpms/firstaidkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4680

Modified Files:
	firstaidkit.spec 
Added Files:
	firstaidkit-0.1.1-syntax-error.patch 
Log Message:
Lets wait until the pyparted stuff from the undel plugin is in pyparted.
fix some syntax error witha patch.



firstaidkit-0.1.1-syntax-error.patch:

--- NEW FILE firstaidkit-0.1.1-syntax-error.patch ---
diff --git a/pyfirstaidkit/configuration.py b/pyfirstaidkit/configuration.py
index 0ed741a..ddd299b 100644
--- pyfirstaidkit/configuration.py
+++ pyfirstaidkit/configuration.py
@@ -41,7 +41,7 @@ def createDefaultConfig(config):
     # Setup a sane default root directory.
     if os.path.isdir("/mnt/sysimage"):
         config.system.root = "/mnt/sysimage"
-    else
+    else:
         config.system.root = "/"
 
     #


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firstaidkit.spec	10 Mar 2008 20:33:53 -0000	1.2
+++ firstaidkit.spec	11 Mar 2008 14:38:30 -0000	1.3
@@ -4,13 +4,14 @@
 
 Name:           firstaidkit
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://fedorahosted.org/firstaidkit
 Source0:        %{name}-%{version}.tar.bz2
+patch0:         %{name}-%{version}-syntax-error.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -46,16 +47,6 @@
 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
@@ -67,11 +58,11 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
 %{__python} setup.py build
-%{__make} subdirs
 
 
 %install
@@ -87,8 +78,7 @@
 %{__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/
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins
 %{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/
 
 
@@ -112,16 +102,16 @@
 
 %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
+* Tue Mar 11 2008 Joel Granados <jgranado at redhat.com> 0.1.1-2
+- Fix dependency problem for ppc64
+- Patch a syntax error
+
 * Mon Mar 10 2008 Joel Granados <jgranado at redhat.com> 0.1.1-1
-- new version
+- New version
 
 * Wed Jan 09 2008 Joel Granados <jgranado at redhat.com> 0.1.0-6
 - Put examples under the firstaidkit-plugins dir




More information about the fedora-extras-commits mailing list