From dafb8e9a4b3d352e477ad5a41774efda7b6efc34 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Nov 02 2013 17:49:12 +0000
Subject: Change dependency on goocanvas on F-20+ (bug 1025095)


- Specify goocanvas version (bug 1024931)

---

diff --git a/alexandria-0.6.9-goocanvas-version.patch b/alexandria-0.6.9-goocanvas-version.patch
new file mode 100644
index 0000000..e016840
--- /dev/null
+++ b/alexandria-0.6.9-goocanvas-version.patch
@@ -0,0 +1,11 @@
+--- alexandria-0.6.9/lib/alexandria/ui/dialogs/barcode_animation.rb.goocanvasver	2011-11-19 23:49:44.000000000 +0900
++++ alexandria-0.6.9/lib/alexandria/ui/dialogs/barcode_animation.rb	2013-11-01 19:29:54.745495052 +0900
+@@ -20,6 +20,8 @@
+ # Boston, MA 02110-1301 USA.
+ #++
+ 
++require 'rubygems'
++gem 'goocanvas', '~> 1.0'
+ require 'goocanvas'
+ 
+ module Alexandria
diff --git a/alexandria.spec b/alexandria.spec
index 06cbdb1..d95c365 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -8,7 +8,7 @@
 %undefine		minorver	
 %undefine		ifpre	
 
-%define		fedorarel	7
+%define		fedorarel	8
 %define		rel		%{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -89,6 +89,8 @@ Patch26:	alexandria-0.6.9-z3950-zoom-count.patch
 # Read negative value as integer in case position has such value
 # (bug 1014295)
 Patch27:	alexandria-0.6.9-negative-value.patch
+# Specify goocanvas version (bug 1024931)
+Patch28:	alexandria-0.6.9-goocanvas-version.patch
 
 BuildArch:	noarch
 
@@ -139,7 +141,13 @@ Requires:	rubygem(glib2)
 #Requires:	ruby(gnome2)
 #Requires:	ruby(libglade2)
 # Added from 0.6.8
-Requires:	rubygem(goocanvas)
+# Requires:	rubygem(goocanvas)
+# The above needs more explicit
+%if 0%{?fedora} >= 20
+Requires:	rubygem-goocanvas1
+%else
+Requires:	rubygem-goocanvas
+%endif
 Requires:	rubygem(gstreamer)
 # Uses syck (bug 922217)
 %if 0%{?fedora} >= 19
@@ -177,6 +185,7 @@ Alexandria is a GNOME application to help you manage your book collection.
 %patch25 -p1 -b .nothread
 %patch26 -p1 -b .z3950_count
 %patch27 -p1 -b .negative
+%patch28 -p1 -b .goocanvasver
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -273,6 +282,10 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Fri Nov  1 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.9-8
+- Change dependency on goocanvas on F-20+ (bug 1025095)
+- Specify goocanvas version (bug 1024931)
+
 * Mon Oct  7 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.9-7
 - Read negative value as integer in case position has such value
   (bug 1014295)