rpms/firstaidkit/devel firstaidkit.spec,1.7,1.8

[Joel Andres Granados Moreno (jgranado)]

Author: jgranado

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

Modified Files:
	firstaidkit.spec 
Log Message:
- New upstream version
- Fixup the spec file
- Erase the unneeded patch files



Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/devel/firstaidkit.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- firstaidkit.spec	13 Mar 2008 14:06:58 -0000	1.7
+++ firstaidkit.spec	3 Jun 2008 14:49:53 -0000	1.8
@@ -3,16 +3,14 @@
 %define _unpackaged_files_terminate_build 0
 
 Name:           firstaidkit
-Version:        0.1.1
-Release:        4%{?dist}
+Version:        0.2.0
+Release:        1%{?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
-patch1:         %{name}-%{version}-syntax-error1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -39,9 +37,11 @@
 
 %package plugin-all
 Group:          Applications/System
-Summary:        All firstaidkit plugins
+Summary:        All firstaidkit plugins, and the gui
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-plugin-passwd
+Requires:       %{name}-plugin-xserver
+Requires:       %{name}-gui
 
 %description plugin-all
 This package provides all the necessary firstaidkit plugins.  It
@@ -52,16 +52,43 @@
 %package plugin-passwd
 Group:          Applications/System
 Summary:        FirstAidKit plugin to manipulate passwd system
+Requires:       %{name} = %{version}-%{release}
 
 %description plugin-passwd
-This plugin provides operations for convenient manipulation
-with the password system.
+This FirstAidKit plugin automates the recovery of the root system
+password.
+
+
+%package plugin-xserver
+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
+configuration file xorg.conf.
+
+
+%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
 
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
+#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
@@ -71,18 +98,29 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
 #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
+%{__install} -d $RPM_BUILD_ROOT%{_mandir}/man1
+%{__install} -p doc/firstaidkit-plugin.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
+%{__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}
+%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
+%{__install} -p etc/firstaidkit/firstaidkit.conf $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
+%{__install} -p etc/firstaidkit/about $RPM_BUILD_ROOT%{_sysconfdir}/firstaidkit
+
+#gui
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit/frontend
+%{__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/
 
 #plugins
-%{__install} -d $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins
-%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit-plugins/
+%{__cp} -f plugins/passwd.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
+%{__cp} -f plugins/xserver.py $RPM_BUILD_ROOT%{_libdir}/firstaidkit/plugins/
 
 
 %clean
@@ -91,24 +129,38 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING doc/README
 # For noarch packages: sitelib
 %{python_sitelib}/pyfirstaidkit
 %{python_sitelib}/%{name}-%{version}-py2.5.egg-info
 %{_bindir}/firstaidkit
-%{_sysconfdir}/firstaidkit.conf
+%{_sysconfdir}/firstaidkit/firstaidkit.conf
+%{_sysconfdir}/firstaidkit/about
 %attr(0644,root,root) %{_mandir}/man1/firstaidkit.1.gz
 
+%files gui
+%{_libdir}/firstaidkit/frontend/*.py*
+%{_libdir}/firstaidkit/frontend/*.glade
+%{_libdir}/firstaidkit/frontend/*.gladep
+
 %files devel
-%{_libdir}/firstaidkit-plugins/examples
-%attr(0644,root,root) %{_mandir}/man1/fakplugin.1.gz
+%{_libdir}/firstaidkit/plugins/examples
+%attr(0644,root,root) %{_mandir}/man1/firstaidkit-plugin.1.gz
 
 %files plugin-all
 
 %files plugin-passwd
-%{_libdir}/firstaidkit-plugins/passwd.py
+%{_libdir}/firstaidkit/plugins/passwd.py*
+
+%files plugin-xserver
+%{_libdir}/firstaidkit/plugins/xserver.py*
+
 
 %Changelog
+* Tue Jun 3 2008 Joel Granados <jgranado at 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 at redhat.com> 0.1.1-4
 - Fix dependency with passwd plugin