rpms/alexandria/F-12 alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch, NONE, 1.1 alexandria.spec, 1.48, 1.49
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Jun 17 17:08:16 UTC 2010
- Previous message: rpms/monkeystudio/F-12 .cvsignore, 1.3, 1.4 monkeystudio.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/alexandria/F-13 alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch, NONE, 1.1 alexandria.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/alexandria/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13418/F-12
Modified Files:
alexandria.spec
Added Files:
alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch
Log Message:
* 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)
alexandria-0.6.6-beta2-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-beta2-dont_use_thread_when_adding_file_by_isdn.patch ---
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)
Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-12/alexandria.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- alexandria.spec 5 Jun 2010 07:41:51 -0000 1.48
+++ alexandria.spec 17 Jun 2010 17:08:16 -0000 1.49
@@ -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 hel
%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 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)
+
* Sat Jun 5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.6.beta2
- Apply patch for upstream bug 28250, icon view rearrangement issue
- Previous message: rpms/monkeystudio/F-12 .cvsignore, 1.3, 1.4 monkeystudio.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message: rpms/alexandria/F-13 alexandria-0.6.6-beta2-dont_use_thread_when_adding_file_by_isdn.patch, NONE, 1.1 alexandria.spec, 1.49, 1.50
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list