[alexandria] Fix crash on z3950 provider with working zoom
Mamoru Tasaka
mtasaka at fedoraproject.org
Tue Apr 10 15:23:45 UTC 2012
commit eaef218aa662a5abafb5e38b303213e28fe391ce
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Wed Apr 11 00:23:41 2012 +0900
Fix crash on z3950 provider with working zoom
alexandria-0.6.8-z3950-next.patch | 11 +++++++++++
alexandria.spec | 9 ++++++++-
clog | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/alexandria-0.6.8-z3950-next.patch b/alexandria-0.6.8-z3950-next.patch
new file mode 100644
index 0000000..665f5e5
--- /dev/null
+++ b/alexandria-0.6.8-z3950-next.patch
@@ -0,0 +1,11 @@
+--- alexandria-0.6.8/./lib/alexandria/book_providers/z3950.rb.next 2009-12-22 06:13:29.000000000 +0900
++++ alexandria-0.6.8/./lib/alexandria/book_providers/z3950.rb 2012-04-10 23:40:53.000000000 +0900
+@@ -100,7 +100,7 @@
+ msg
+ }
+
+- next if marc.title.nil? # or marc.authors.empty?
++ raise if marc.title.nil? # or marc.authors.empty?
+
+ isbn = isbn or marc.isbn
+ isbn = Library.canonicalise_ean(isbn)
diff --git a/alexandria.spec b/alexandria.spec
index 7e904e1..26a721c 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -5,7 +5,7 @@
%undefine minorver
%undefine ifpre
-%define fedorarel 4
+%define fedorarel 5
%define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
@@ -50,6 +50,9 @@ Patch14: alexandria-0.6.8-ascii-fix.patch
Patch15: alexandria-0.6.8-kcodefix.patch
# eval fix
Patch16: alexandria-0.6.8-evalfix.patch
+# With working zoom and ruby19, z3950 provider aborts
+# with syntax error about next
+Patch17: alexandria-0.6.8-z3950-next.patch
BuildArch: noarch
BuildRequires: ruby(abi) >= %{rubyabi}
@@ -116,6 +119,7 @@ Alexandria is a GNOME application to help you manage your book collection.
%patch14 -p1 -b .ascii
%patch15 -p1 -b .kcodefix
%patch16 -p1 -b .evalfix
+%patch17 -p1 -b .z3950_next
# Embed Fedora EVR
%{__sed} -i.evr \
@@ -210,6 +214,9 @@ exit 0
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
+* Wed Apr 11 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.8-5
+- Fix crash on z3950 provider with working zoom
+
* Sun Apr 8 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 0.6.8-4
- Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales)
diff --git a/clog b/clog
index a56b3ab..9a0de9e 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,2 @@
-Fix crash on ja_JP.utf8 (and perhaps on other multibyte locales)
+Fix crash on z3950 provider with working zoom
More information about the scm-commits
mailing list