From bcbff3fd9999aa40139ae3cbd95fd12e9c4c9cd0 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jun 17 2010 17:08:16 +0000
Subject: - Execute add_single_book_by_isbn in non-thread, which will fix the crash

    when imporing books with ISDN (upstream bug 28263)

---

diff --git a/alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch b/alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch
new file mode 100644
index 0000000..560264b
--- /dev/null
+++ b/alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch
@@ -0,0 +1,24 @@
+Index: lib/alexandria/ui/dialogs/new_book_dialog.rb
+===================================================================
+--- lib/alexandria/ui/dialogs/new_book_dialog.rb	(revision 1142)
++++ lib/alexandria/ui/dialogs/new_book_dialog.rb	(working copy)
+@@ -384,8 +384,8 @@
+         assert_not_exist(library, @entry_isbn.text)        
+         @button_add.sensitive = false  
+         notify_start_add_by_isbn
+-        @find_thread = Thread.new do
+-          log.info { "New @find_thread #{Thread.current}" }
++        #@find_thread = Thread.new do
++          #log.info { "New @find_thread #{Thread.current}" }
+           begin
+             # MAJOR HACK, add this again...
+             Alexandria::BookProviders.instance.add_observer(self)
+@@ -418,7 +418,7 @@
+             Alexandria::BookProviders.instance.delete_observer(self)
+             notify_end_add_by_isbn
+           end          
+-        end
++        #end
+       end
+ 
+       def add_selected_books(library, is_new)
diff --git a/alexandria.spec b/alexandria.spec
index c16cb19..7d8fc87 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -5,7 +5,7 @@
 %define		majorver	0.6.6
 %define		minorver	beta2
 
-%define		fedorarel	6
+%define		fedorarel	7
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,12 +19,15 @@ Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz
+# Patches discussing with the upstream
 # 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
+# Trial fix for crash when importing a book with isdn
+Patch3:		alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch
 # Upstream patches
 # alexandria-Bugs-28250 icon view won't rearrange icons when suggested
-Patch10:	alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
+Patch100:	alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
 
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -72,7 +75,8 @@ Alexandria is a GNOME application to help you manage your book collection.
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch10 -p0 -b .up28250
+%patch3 -p0 -b .up28263
+%patch100 -p0 -b .up28250
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -171,6 +175,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Fri Jun 18 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.7.beta2
+- Execute add_single_book_by_isbn in non-thread, which will fix the crash
+  when imporing books with ISDN (upstream bug 28263)
+
 * Sat Jun  5 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.6.beta2
 - Apply patch for upstream bug 28250, icon view rearrangement issue