rpms/alexandria/F-7 alexandria-0.6.2b2-dont_fail_on_no_evolution.patch, NONE, 1.1 alexandria.spec, 1.5, 1.6

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

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


alexandria-0.6.2b2-dont_fail_on_no_evolution.patch:

--- NEW FILE alexandria-0.6.2b2-dont_fail_on_no_evolution.patch ---
--- alexandria-0.6.2b2/lib/alexandria/ui/completion_models.rb.noevolution	2007-08-23 04:24:56.000000000 +0900
+++ alexandria-0.6.2b2/lib/alexandria/ui/completion_models.rb	2007-12-16 15:44:13.000000000 +0900
@@ -71,6 +71,8 @@
     end
 rescue LoadError
     EVOLUTION_CONTACTS = []
+rescue Revolution::RevolutionException
+    EVOLUTION_CONTACTS = []
 end
 
 module Alexandria


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-7/alexandria.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- alexandria.spec	11 Dec 2007 18:02:37 -0000	1.5
+++ alexandria.spec	16 Dec 2007 06:55:48 -0000	1.6
@@ -5,7 +5,7 @@
 %define		majorver	0.6.2
 %define		minorver	b2
 
-%define		fedorarel	3
+%define		fedorarel	4
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,6 +19,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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -63,6 +64,7 @@
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
+%patch0 -p1 -b .noevolution
 
 %build
 rake build
@@ -165,6 +167,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
+- Pass exception when user don't use evolution for mailer.
+
 * Wed Dec 12 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-0.3.b2
 - Also require ruby(revolution)