rpms/firstaidkit/F-13 .cvsignore, 1.12, 1.13 firstaidkit.desktop, 1.1, 1.2 firstaidkit.spec, 1.34, 1.35 sources, 1.16, 1.17

[Martin Sivák]

Author: msivak

Update of /cvs/pkgs/rpms/firstaidkit/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32419

Modified Files:
	.cvsignore firstaidkit.desktop firstaidkit.spec sources 
Log Message:
new version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	2 Mar 2010 13:48:14 -0000	1.12
+++ .cvsignore	24 May 2010 08:59:56 -0000	1.13
@@ -1 +1,2 @@
-firstaidkit-0.2.10.tar.gz
+firstaidkit-0.2.11.tar.gz
+firstaidkit.desktop


Index: firstaidkit.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/firstaidkit.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- firstaidkit.desktop	27 Nov 2008 14:07:59 -0000	1.1
+++ firstaidkit.desktop	24 May 2010 08:59:56 -0000	1.2
@@ -7,4 +7,4 @@ Exec=firstaidkit -g gtk
 Comment=System rescue and recovery tool
 Categories=System;
 Terminal=false
-
+Icon=firstaidkit


Index: firstaidkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/firstaidkit.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- firstaidkit.spec	2 Mar 2010 13:48:15 -0000	1.34
+++ firstaidkit.spec	24 May 2010 08:59:56 -0000	1.35
@@ -1,15 +1,23 @@
 %{!?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
+# I don't want the unpackaged file check
 %define _unpackaged_files_terminate_build 0
+%define debug_package %{nil}
 
 Name:           firstaidkit
-Version:        0.2.10
-Release:        1%{?dist}
+Version:        0.2.11
+Release:        2%{?dist}
 Summary:        System Rescue Tool
 
 Group:          Applications/System
 License:        GPLv2+
-Url:            http://git.fedorahosted.org/git/?p=firstaidkit.git;a=snapshot;h=%{name}-%{version}-%{release};sf=tgz
+Url:            http://firstaidkit.fedorahosted.org
+
+# Get the source from:
+#
+# http://git.fedorahosted.org/git/?p=firstaidkit.git;a=snapshot;h=%{name}-%{version}-%{release};sf=tgz
+#  or
+# git clone git://git.fedorahosted.org/firstaidkit.git && make tarball
+
 Source0:        %{name}-%{version}.tar.gz
 Source3:        %{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -133,27 +141,6 @@ BuildArch:      noarch
 This plugin helps recover encryption keys using a previously created escrow
 packet.
 
-#%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
-#BuildArch:      noarch
-#
-#%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
 %setup -q
@@ -185,6 +172,8 @@ packet.
 %{__install} -p frontend/*.py  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
 %{__install} -p frontend/*.glade  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
 %{__install} -p frontend/*.gladep  $RPM_BUILD_ROOT/usr/share/firstaidkit/frontend/
+%{__install} -d $RPM_BUILD_ROOT/usr/share/icons
+%{__install} -p images/FAK-bandaid.png $RPM_BUILD_ROOT/usr/share/icons/firstaidkit.png
 desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
 
 #examples
@@ -202,13 +191,6 @@ desktop-file-install --vendor="fedora" -
 %{__cp} -f plugins/mdadm_conf.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/
 %{__cp} -f plugins/key_recovery.py $RPM_BUILD_ROOT/usr/share/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/usr/share/firstaidkit/plugins/rpm
-#%{__cp} -f plugins/rpm/*.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm/
-#%{__install} -d $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm_lowlevel
-#%{__cp} -f plugins/rpm_lowlevel/*.py $RPM_BUILD_ROOT/usr/share/firstaidkit/plugins/rpm_lowlevel/
-
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -238,6 +220,7 @@ desktop-file-install --vendor="fedora" -
 /usr/share/firstaidkit/frontend/*.py*
 /usr/share/firstaidkit/frontend/*.glade
 /usr/share/firstaidkit/frontend/*.gladep
+/usr/share/icons/*.png
 %{_datadir}/applications/*.desktop
 %dir /usr/share/firstaidkit/frontend
 
@@ -272,17 +255,20 @@ desktop-file-install --vendor="fedora" -
 %defattr(-,root,root,-)
 /usr/share/firstaidkit/plugins/key_recovery.py*
 
-#%files plugin-undelete-partitions
-#%defattr(-,root,root,-)
-#%{_libdir}/firstaidkit/plugins/undelparts/*.py*
-#%{_libdir}/firstaidkit/plugins/undelparts/*.so
-#
-#%files plugin-rpm
-#%defattr(-,root,root,-)
-#/usr/share/firstaidkit/plugins/rpm_lowlevel/*
-#
 
 %changelog
+* Mon May 22 2010 Martin Sivak <msivak at redhat.com> - 0.2.11-2
+- Add menu icon
+  Resolves: rhbz#587903
+
+* Tue Mar 30 2010 Martin Sivak <msivak at redhat.com> - 0.2.11-1
+- Add missing files to configuration and docs
+- Use full sized buttons in text-mode firstaidkit-qs
+  Resolves: rhbz#576110
+
+* Mon Mar 29 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-2
+- Spec file cleanup
+
 * Tue Mar 02 2010 Martin Sivak <msivak at redhat.com> - 0.2.10-1
 - Change placement of architecture independent files
   Related: rhbz#510346
@@ -423,4 +409,4 @@ desktop-file-install --vendor="fedora" -
 
 * Wed Jan 02 2008 Joel Granados <jgranado at redhat.com> 0.1.0-1
 - Initial spec
-%{_libdir}/firstaidkit/plugins/rpm/*
+- {_libdir}/firstaidkit/plugins/rpm/*


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firstaidkit/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	2 Mar 2010 13:48:15 -0000	1.16
+++ sources	24 May 2010 08:59:56 -0000	1.17
@@ -1 +1,2 @@
-2467c8411ce0a212349e04ed23d60353  firstaidkit-0.2.10.tar.gz
+2aed9b7fe2f224813ba6b9c5df4feb5b  firstaidkit-0.2.11.tar.gz
+86175ac67bc3ad8cfef9c0731b69feca  firstaidkit.desktop