From 79ffd8f730dca92d203ad5f0a071aa1e5f7793bb Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jun 22 2010 08:02:38 +0000
Subject: - Update to 0.6.6

- Still apply Patch3 (it seems isdn segv fix isn't complete)

---

diff --git a/.cvsignore b/.cvsignore
index a1532a5..b0a9aff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alexandria-0.6.6-beta2.tar.gz
+alexandria-0.6.6.tar.gz
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
deleted file mode 100644
index 560264b..0000000
--- a/alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch b/alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch
new file mode 100644
index 0000000..b8635d2
--- /dev/null
+++ b/alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch
@@ -0,0 +1,22 @@
+--- alexandria-0.6.6/./lib/alexandria/ui/dialogs/new_book_dialog.rb.up28263	2010-06-19 10:36:21.000000000 +0900
++++ alexandria-0.6.6/./lib/alexandria/ui/dialogs/new_book_dialog.rb	2010-06-22 16:51:25.000000000 +0900
+@@ -389,8 +389,8 @@
+         notify_start_add_by_isbn
+         Gtk.idle_add do
+ 
+-          @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)
+@@ -423,7 +423,7 @@
+               Alexandria::BookProviders.instance.delete_observer(self)
+               notify_end_add_by_isbn
+             end          
+-          end
++          #end
+ 
+           false
+         end
diff --git a/alexandria.spec b/alexandria.spec
index 7d8fc87..e4bb41c 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -1,11 +1,11 @@
 %{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
 %define		rubyabi		1.8
-%define		repoid		70623
+%define		repoid		71308
 
 %define		majorver	0.6.6
-%define		minorver	beta2
+%undefine		minorver	
 
-%define		fedorarel	7
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -24,10 +24,10 @@ Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?mi
 # 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
+# With alexandria-0.6.6, the fix for this issue is still incomplete
+# ref: alexandria-BUgs-28263
+Patch3:		alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch
 # Upstream patches
-# alexandria-Bugs-28250 icon view won't rearrange icons when suggested
-Patch100:	alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
 
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -75,8 +75,7 @@ Alexandria is a GNOME application to help you manage your book collection.
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
-%patch3 -p0 -b .up28263
-%patch100 -p0 -b .up28250
+%patch3 -p1 -b .up28263
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -175,6 +174,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Tue Jun 22 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-1
+- Update to 0.6.6
+- Still apply Patch3 (it seems isdn segv fix isn't complete)
+
 * 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)
diff --git a/sources b/sources
index d312684..4063af7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a707796c2564e6f72bdf47b0cd57187  alexandria-0.6.6-beta2.tar.gz
+76bc7054b19e033c1448346fa3232d64  alexandria-0.6.6.tar.gz