rpms/alexandria/F-10 alexandria-0.6.4-bookentry-after-sorting.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 alexandria.spec, 1.19, 1.20 sources, 1.7, 1.8

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12404/F-10

Modified Files:
	.cvsignore alexandria.spec sources 
Added Files:
	alexandria-0.6.4-bookentry-after-sorting.patch 
Log Message:
* Sun Mar 15 2009 Mamoru Tasaka <mtasaka at 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)


alexandria-0.6.4-bookentry-after-sorting.patch:

--- NEW FILE alexandria-0.6.4-bookentry-after-sorting.patch ---
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...


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Mar 2009 16:12:34 -0000	1.7
+++ .cvsignore	15 Mar 2009 18:03:10 -0000	1.8
@@ -1 +1 @@
-alexandria-0.6.4b1.tar.gz
+alexandria-0.6.4.tar.gz


Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- alexandria.spec	6 Mar 2009 01:35:20 -0000	1.19
+++ alexandria.spec	15 Mar 2009 18:03:10 -0000	1.20
@@ -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 @@
 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 @@
 
 %prep
 %setup -q -n %{name}-%{majorver}%{?minorver}
+%patch0 -p0 -b .up24568
 
 %build
 rake build
@@ -182,11 +185,17 @@
 %{_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 at 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 at ioa.s.u-tokyo.ac.jp> - 0.6.4-0.2.b1
 - Add ruby(htmlentities) dependency
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Mar 2009 16:12:35 -0000	1.7
+++ sources	15 Mar 2009 18:03:10 -0000	1.8
@@ -1 +1 @@
-8ba05129772f6bfb4b57f7b01bde00b3  alexandria-0.6.4b1.tar.gz
+f10815b67abe17e70022b07993e32d2e  alexandria-0.6.4.tar.gz