From a8bddf55f9213fc4dac3d0b6d2e7cdd55ae6d061 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Mar 15 2009 18:03:10 +0000
Subject: - 0.6.4

- Patch from upstream to fix issue when book entry is once sorted (upstream
    bug 24568)

---

diff --git a/.cvsignore b/.cvsignore
index cbd9fba..a128b3c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alexandria-0.6.4b1.tar.gz
+alexandria-0.6.4.tar.gz
diff --git a/alexandria-0.6.4-bookentry-after-sorting.patch b/alexandria-0.6.4-bookentry-after-sorting.patch
new file mode 100644
index 0000000..798ce80
--- /dev/null
+++ b/alexandria-0.6.4-bookentry-after-sorting.patch
@@ -0,0 +1,20 @@
+Index: lib/alexandria/ui/ui_manager.rb
+===================================================================
+--- lib/alexandria/ui/ui_manager.rb	(revision 1064)
++++ lib/alexandria/ui/ui_manager.rb	(revision 1065)
+@@ -918,10 +918,13 @@
+         selection = page == 0 ? @iconview : @listview.selection
+ 
+         selection.selected_each do |the_view, path|
+-          unless the_view.model
++          # don't use the_view which is passed in by this block
++          # as it doesn't consider the filtering for some reason
++          # see bug #24568
++          unless view.model
+             next
+           end
+-          path = the_view.model.convert_path_to_child_path(path)
++          path = view.model.convert_path_to_child_path(path)
+           if path
+             path = @filtered_model.convert_path_to_child_path(path)
+             # FIX this sometimes returns a nil path for iconview...
diff --git a/alexandria.spec b/alexandria.spec
index b67aec0..079a38e 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		52527
+%define		repoid		53204
 
 %define		majorver	0.6.4
-%define		minorver	b1
+%undefine		minorver	
 
-%define		fedorarel	2
+%define		fedorarel	1
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -19,6 +19,8 @@ Group:		Applications/Productivity
 License:	GPLv2+
 URL:		http://alexandria.rubyforge.org/
 Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
+# Ref: upstream bug 24568
+Patch0:		alexandria-0.6.4-bookentry-after-sorting.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -68,6 +70,7 @@ Alexandria is a GNOME application to help you manage your book collection.
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
+%patch0 -p0 -b .up24568
 
 %build
 rake build
@@ -182,11 +185,17 @@ exit 0
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
+%{_datadir}/sounds/%{name}/
 
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sun Mar 15 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4-1
+- 0.6.4
+- Patch from upstream to fix issue when book entry is once sorted
+  (upstream bug 24568)
+
 * Fri Mar  6 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
 
diff --git a/sources b/sources
index 780c152..a335427 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8ba05129772f6bfb4b57f7b01bde00b3  alexandria-0.6.4b1.tar.gz
+f10815b67abe17e70022b07993e32d2e  alexandria-0.6.4.tar.gz