diff --git a/alexandria-0.6.2b2-crash-when-no-yelp.patch b/alexandria-0.6.2b2-crash-when-no-yelp.patch new file mode 100644 index 0000000..170b874 --- /dev/null +++ b/alexandria-0.6.2b2-crash-when-no-yelp.patch @@ -0,0 +1,13 @@ +--- 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 + diff --git a/alexandria.spec b/alexandria.spec index c21f5e3..b0cfe48 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -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 @@ License: GPLv2+ 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 @@ Alexandria is a GNOME application to help you manage your book collection. %prep %setup -q -n %{name}-%{majorver}%{?minorver} %patch0 -p1 -b .noevolution +%patch1 -p1 -b .noyelp %build rake build @@ -167,8 +169,9 @@ exit 0 %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Sun Dec 16 2007 Mamoru Tasaka - 0.6.2-0.4.b2 +* Sun Dec 16 2007 Mamoru Tasaka - 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 - 0.6.2-0.3.b2 - Also require ruby(revolution)