From cc895f52a6fdaab244cdc924ac14727316e2440a Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Apr 16 2009 17:41:50 +0000
Subject: sync with devel


---

diff --git a/alexandria-0.6.4.1-hang-importing-invalid-isdn.patch b/alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
new file mode 100644
index 0000000..51bf2e3
--- /dev/null
+++ b/alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
@@ -0,0 +1,17 @@
+Index: lib/alexandria/import_library.rb
+===================================================================
+--- lib/alexandria/import_library.rb	(revision 1073)
++++ lib/alexandria/import_library.rb	(working copy)
+@@ -300,7 +300,11 @@
+           unless isbn[1]
+             bad_isbns << isbn[0]
+           else
+-            books << Alexandria::BookProviders.isbn_search(isbn[1])
++            begin
++              books << Alexandria::BookProviders.isbn_search(isbn[1])
++            rescue => e
++              puts e.message
++            end
+           end
+         rescue => e
+           puts e.message
diff --git a/alexandria.spec b/alexandria.spec
index 79f0dd6..ecf190c 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -5,7 +5,7 @@
 %define		majorver	0.6.4.1
 %undefine		minorver	
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -26,6 +26,9 @@ Patch0:		alexandria-0.6.4.1-use-2args-bindtextdomain.patch
 # Fix for issue with right click on left pane
 # ref: alexandria-Bugs-25021
 Patch1:		alexandria-0.6.4.1-right-click-left-pane.patch
+# Trial fix for hang up when importing list containing invalid isdn
+# ref: alexandria-Bugs-25348
+Patch2:		alexandria-0.6.4.1-hang-importing-invalid-isdn.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -77,6 +80,7 @@ Alexandria is a GNOME application to help you manage your book collection.
 %setup -q -n %{name}-%{majorver}%{?minorver}
 %patch0 -p0 -b .up24882
 %patch1 -p0 -b .up25021
+%patch2 -p0 -b .up25348
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -203,6 +207,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Mon Apr 13 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
+- Trial fix to fix hang when importing list containing invalid
+  isdn (alexandria-Bugs-25348)
+
 * Wed Apr  8 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4.1-5
 - Embed Fedora EVR
 
@@ -215,12 +223,12 @@ exit 0
   (alexandria-Bugs-24882)
 
 * Mon Mar 16 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4.1-1
-- 0.6.4.1 (fixing upstream bug 24568)
+- 0.6.4.1 (fixing alexandria-Bugs-24568)
 
 * Sun Mar 15 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4-1
 - 0.6.4
 - Patch from upstream to fix issue when book entry is once sorted
-  (upstream bug 24568)
+  (alexandria-Bugs-24568)
 
 * Fri Mar  6 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
@@ -237,6 +245,7 @@ exit 0
 
 * Thu Feb 26 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.3-9
 - Attempt to handle UTF-8 strings in library names correctly
+  (alexandria-Bugs-20168)
 
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - F-11: Mass rebuild
@@ -254,6 +263,7 @@ exit 0
 * Wed Jul 16 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.3-5
 - Remove workaround for bug 436697 (tooltips crash).
   This was a bug on ruby-gnome2 which is fixed in 0.17.0 rc1
+  (ref: alexandria-Bugs-19042)
 
 * Thu Apr  3 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.3-4
 - Drop ruby(amazon) dependency (Amazon no longer provides AWSv3,