rpms/alexandria/F-7 alexandria-0.6.2-rh427070.patch, NONE, 1.1 alexandria.spec, 1.9, 1.10

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Mon Dec 31 01:52:24 UTC 2007


Author: mtasaka

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

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.2-rh427070.patch 
Log Message:
* Mon Dec 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-2
- Trial workaround patch for bug 427070


alexandria-0.6.2-rh427070.patch:

--- NEW FILE alexandria-0.6.2-rh427070.patch ---
--- alexandria-0.6.2/lib/alexandria/ui/completion_models.rb.orig	2007-12-20 05:50:47.000000000 +0900
+++ alexandria-0.6.2/lib/alexandria/ui/completion_models.rb	2007-12-31 10:40:47.000000000 +0900
@@ -74,6 +74,9 @@
 rescue Revolution::RevolutionException => e
   Alexandria::log.warn { e.message }
   EVOLUTION_CONTACTS = []
+rescue ArgumentError => e
+  Alexandria::log.warn { e.message }
+  EVOLUTION_CONTACTS = []
 end
 
 module Alexandria


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-7/alexandria.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alexandria.spec	20 Dec 2007 07:41:23 -0000	1.9
+++ alexandria.spec	31 Dec 2007 01:51:45 -0000	1.10
@@ -5,7 +5,7 @@
 %define		majorver	0.6.2
 %undefine		minorver	
 
-%define		fedorarel	1
+%define		fedorarel	2
 %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.2-rh427070.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 .rh427070
 
 %build
 rake build
@@ -173,6 +175,9 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Dec 31 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-2
+- Trial workaround patch for bug 427070
+
 * Thu Dec 20 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.2-1
 - 0.6.2
 - Two patches for 0.6.2b2 are removed.




More information about the fedora-extras-commits mailing list