From c678691b27782e2564eac11f5f803e8b656763fd Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Jun 05 2010 07:41:50 +0000
Subject: - Apply patch for upstream bug 28250, icon view rearrangement issue


---

diff --git a/alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch b/alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
new file mode 100644
index 0000000..653d46f
--- /dev/null
+++ b/alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
@@ -0,0 +1,37 @@
+------------------------------------------------------------------------
+r1142 | cathalmagus | 2010-05-27 00:58:10 +0900 (Thu, 27 May 2010) | 2 lines
+
+Fixes #28250, now icon mode will re-arrange icons when told
+
+------------------------------------------------------------------------
+Index: lib/alexandria/ui/callbacks.rb
+===================================================================
+--- lib/alexandria/ui/callbacks.rb	(revision 1141)
++++ lib/alexandria/ui/callbacks.rb	(revision 1142)
+@@ -333,12 +333,12 @@
+         toggle_actions = [
+           ["Sidepane", nil, _("Side _Pane"), "F9", nil,
+             on_view_sidepane, true],
+-            ["Toolbar", nil, _("_Toolbar"), nil, nil,
+-              on_view_toolbar, true],
+-              ["Statusbar", nil, _("_Statusbar"), nil, nil,
+-                on_view_statusbar, true],
+-                ["ReversedOrder", nil, _("Re_versed Order"), nil, nil,
+-                  on_reverse_order],
++          ["Toolbar", nil, _("_Toolbar"), nil, nil,
++            on_view_toolbar, true],
++          ["Statusbar", nil, _("_Statusbar"), nil, nil,
++            on_view_statusbar, true],
++          ["ReversedOrder", nil, _("Re_versed Order"), nil, nil,
++            on_reverse_order],
+         ]
+ 
+         view_as_actions = [
+@@ -375,6 +375,7 @@
+         end
+         @actiongroup.add_radio_actions(arrange_icons_actions) do |action, current|
+           @prefs.arrange_icons_mode = current.current_value
++          setup_books_iconview_sorting
+         end
+       end
+     end
diff --git a/alexandria.spec b/alexandria.spec
index 3a50b27..c16cb19 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -5,7 +5,7 @@
 %define		majorver	0.6.6
 %define		minorver	beta2
 
-%define		fedorarel	5
+%define		fedorarel	6
 %define		rel		%{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
 
 
@@ -22,7 +22,9 @@ Source0:	http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?mi
 # 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
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Upstream patches
+# alexandria-Bugs-28250 icon view won't rearrange icons when suggested
+Patch10:	alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch
 
 BuildArch:	noarch
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -70,6 +72,7 @@ Alexandria is a GNOME application to help you manage your book collection.
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver:-%{?minorver}}
 %patch2 -p0 -b .up25348
+%patch10 -p0 -b .up28250
 
 # Embed Fedora EVR
 %{__sed} -i.evr \
@@ -168,6 +171,9 @@ exit 0
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 
 %changelog
+* Sat Jun  5 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.6.beta2
+- Apply patch for upstream bug 28250, icon view rearrangement issue
+
 * Sat May  8 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.6-0.5.beta2
 - Try 0.6.6 beta2