rpms/alexandria/F-11 alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch, NONE, 1.1 alexandria.spec, 1.43, 1.44

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25931/F-11

Modified Files:
	alexandria.spec 
Added Files:
	alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch 
Log Message:
* 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


alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch:
 callbacks.rb |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--- NEW FILE alexandria-0.6.6-beta2-rev1142-iconview-rearrange.patch ---
------------------------------------------------------------------------
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


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-11/alexandria.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- alexandria.spec	8 May 2010 09:29:21 -0000	1.43
+++ alexandria.spec	5 Jun 2010 07:41:50 -0000	1.44
@@ -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/downlo
 # 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 hel
 %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 at 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 at ioa.s.u-tokyo.ac.jp> - 0.6.6-0.5.beta2
 - Try 0.6.6 beta2