rpms/alexandria/F-10 alexandria-0.6.5-glib_convert-syntax.patch, NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.26, 1.27 sources, 1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch, 1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Aug 19 22:13:59 UTC 2009
- Previous message (by thread): rpms/perl-Class-DBI-Loader-Relationship/devel perl-Class-DBI-Loader-Relationship.spec, 1.12, 1.13
- Next message (by thread): rpms/alexandria/F-11 alexandria-0.6.5-glib_convert-syntax.patch, NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.33, 1.34 sources, 1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch, 1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/alexandria/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14613/F-10
Modified Files:
.cvsignore alexandria.spec sources
Added Files:
alexandria-0.6.5-glib_convert-syntax.patch
alexandria-0.6.5-search-result-sanity-check.patch
Removed Files:
alexandria-0.6.4.1-right-click-left-pane-morefix.patch
alexandria-0.6.4.1-right-click-left-pane.patch
Log Message:
* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
- Update to 0.6.5
- Remove 2 upstreamed patches (1 patch still unremoved)
- Add 2 patches, will report upstream
alexandria-0.6.5-glib_convert-syntax.patch:
utils.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE alexandria-0.6.5-glib_convert-syntax.patch ---
Index: lib/alexandria/utils.rb
===================================================================
--- lib/alexandria/utils.rb (revision 1085)
+++ lib/alexandria/utils.rb (working copy)
@@ -20,7 +20,11 @@
class String
def convert(charset_from, charset_to)
- GLib.convert(self, charset_from, charset_to)
+#
+# Ask upstream!! Perhaps from <-> to are reverse
+# http://ruby-gnome2.sourceforge.jp/hiki.cgi?GLib#GLib.convert
+#
+ GLib.convert(self, charset_to, charset_from)
end
end
alexandria-0.6.5-search-result-sanity-check.patch:
book_providers.rb | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE alexandria-0.6.5-search-result-sanity-check.patch ---
Index: lib/alexandria/book_providers.rb
===================================================================
--- lib/alexandria/book_providers.rb (revision 1085)
+++ lib/alexandria/book_providers.rb (working copy)
@@ -46,6 +46,9 @@
self.instance.notify_observers(:searching, factory.fullname) # new
results = factory.search(criterion, type)
+ # sanity check if at least one valid result is actually found
+ results.delete_if { |book, cover| ((!book) || (!cover)) }
+
if results.length == 0
self.instance.changed
self.instance.notify_observers(:not_found, factory.fullname) # new
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 15 Mar 2009 18:30:09 -0000 1.9
+++ .cvsignore 19 Aug 2009 22:13:58 -0000 1.10
@@ -1 +1 @@
-alexandria-0.6.4.1.tar.gz
+alexandria-0.6.5.tar.gz
Index: alexandria.spec
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/alexandria.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- alexandria.spec 16 Apr 2009 17:41:50 -0000 1.26
+++ alexandria.spec 19 Aug 2009 22:13:58 -0000 1.27
@@ -1,11 +1,11 @@
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%define rubyabi 1.8
-%define repoid 53230
+%define repoid 62178
-%define majorver 0.6.4.1
+%define majorver 0.6.5
%undefine minorver
-%define fedorarel 6
+%define fedorarel 1
%define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver}
@@ -19,16 +19,15 @@ Group: Applications/Productivity
License: GPLv2+
URL: http://alexandria.rubyforge.org/
Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz
-# Use 2 arguments format for bindtextdomain() instead of
-# deprecated 4 arguments format
-# ref: alexandria-Bugs-24882 alexandria-Bugs-24882
-Patch0: alexandria-0.6.4.1-use-2args-bindtextdomain.patch
-# Fix for issue with right click on left pane
-# ref: alexandria-Bugs-25021
-Patch1: alexandria-0.6.4.1-right-click-left-pane.patch
# 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
+# Need ask to upstream
+# perhaps there is some confusion about GLib.convert...
+Patch3: alexandria-0.6.5-glib_convert-syntax.patch
+# Need ask to upstream
+# Sometimes search result has empty book or cover entry
+Patch4: alexandria-0.6.5-search-result-sanity-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -78,9 +77,9 @@ Alexandria is a GNOME application to hel
%prep
%setup -q -n %{name}-%{majorver}%{?minorver}
-%patch0 -p0 -b .up24882
-%patch1 -p0 -b .up25021
%patch2 -p0 -b .up25348
+%patch3 -p0 -b .glib
+%patch4 -p0 -b .result
# Embed Fedora EVR
%{__sed} -i.evr \
@@ -207,6 +206,14 @@ exit 0
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
+* Thu Aug 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.5-1
+- Update to 0.6.5
+- Remove 2 upstreamed patches (1 patch still unremoved)
+- Add 2 patches, will report upstream
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- F-12: Mass rebuild
+
* Mon Apr 13 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.6.4.1-6
- Trial fix to fix hang when importing list containing invalid
isdn (alexandria-Bugs-25348)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alexandria/F-10/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 15 Mar 2009 18:30:09 -0000 1.9
+++ sources 19 Aug 2009 22:13:58 -0000 1.10
@@ -1 +1 @@
-80e4def0f0890460eb0689489a05c745 alexandria-0.6.4.1.tar.gz
+9c8655f361e6a0c6f8cdc97f36bd2d0f alexandria-0.6.5.tar.gz
--- alexandria-0.6.4.1-right-click-left-pane-morefix.patch DELETED ---
--- alexandria-0.6.4.1-right-click-left-pane.patch DELETED ---
- Previous message (by thread): rpms/perl-Class-DBI-Loader-Relationship/devel perl-Class-DBI-Loader-Relationship.spec, 1.12, 1.13
- Next message (by thread): rpms/alexandria/F-11 alexandria-0.6.5-glib_convert-syntax.patch, NONE, 1.1 alexandria-0.6.5-search-result-sanity-check.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 alexandria.spec, 1.33, 1.34 sources, 1.9, 1.10 alexandria-0.6.4.1-right-click-left-pane-morefix.patch, 1.1, NONE alexandria-0.6.4.1-right-click-left-pane.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list