rpms/alexandria/F-13 alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 alexandria.spec, 1.50, 1.51 sources, 1.14, 1.15 alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch, 1.1, NONE

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10365/F-13

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch 
Removed Files:
	alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch 
Log Message:
* Tue Jun 22 2010 Mamoru Tasaka <mtasaka at 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)


alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch:
 new_book_dialog.rb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE alexandria-0.6.6-dont_use_thread_when_adding_file_by_isdn.patch ---
--- 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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-13/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	8 May 2010 09:29:21 -0000	1.14
+++ .cvsignore	22 Jun 2010 08:02:35 -0000	1.15
@@ -1 +1 @@
-alexandria-0.6.6-beta2.tar.gz
+alexandria-0.6.6.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-13/alexandria.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- alexandria.spec	17 Jun 2010 17:08:16 -0000	1.50
+++ alexandria.spec	22 Jun 2010 08:02:38 -0000	1.51
@@ -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/downlo
 # 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 hel
 %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 at 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 at 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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-13/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	8 May 2010 09:29:22 -0000	1.14
+++ sources	22 Jun 2010 08:02:38 -0000	1.15
@@ -1 +1 @@
-0a707796c2564e6f72bdf47b0cd57187  alexandria-0.6.6-beta2.tar.gz
+76bc7054b19e033c1448346fa3232d64  alexandria-0.6.6.tar.gz


--- alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch DELETED ---