rpms/alexandria/F-8 alexandria-0.6.2b2-crash-when-no-yelp.patch, NONE, 1.1 alexandria.spec, 1.7, 1.8

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17968/F-8

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.2b2-crash-when-no-yelp.patch 
Log Message:
* Sun Dec 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.5.b2
- Pass exception when user don't use evolution for mailer.
- Fix crash when yelp is not installed.


alexandria-0.6.2b2-crash-when-no-yelp.patch:

--- NEW FILE alexandria-0.6.2b2-crash-when-no-yelp.patch ---
--- alexandria-0.6.2b2/lib/alexandria/ui/main_app.rb.noyelp	2007-10-26 00:16:17.000000000 +0900
+++ alexandria-0.6.2b2/lib/alexandria/ui/main_app.rb	2007-12-16 18:05:07.000000000 +0900
@@ -290,7 +290,9 @@
 
       def display_help
         Gnome::Help.display('alexandria',
-                            nil) rescue ErrorDialog.new(@main_app,
+                            nil) 
+	rescue => e 
+		ErrorDialog.new(@main_app,
                             e.message)
       end
 


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-8/alexandria.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alexandria.spec	16 Dec 2007 06:55:59 -0000	1.7
+++ alexandria.spec	16 Dec 2007 09:15:26 -0000	1.8
@@ -5,7 +5,7 @@
 %define		majorver	0.6.2
 %define		minorver	b2
 
-%define		fedorarel	4
+%define		fedorarel	5
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -20,6 +20,7 @@
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
 Patch0:		alexandria-0.6.2b2-dont_fail_on_no_evolution.patch
+Patch1:		alexandria-0.6.2b2-crash-when-no-yelp.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -65,6 +66,7 @@
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p1 -b .noevolution
+%patch1 -p1 -b .noyelp
 
 %build
 rake build
@@ -167,8 +169,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
-* Sun Dec 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.4.b2
+* Sun Dec 16 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.5.b2
 - Pass exception when user don't use evolution for mailer.
+- Fix crash when yelp is not installed.
 
 * Wed Dec 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.3.b2
 - Also require ruby(revolution)