diff --git a/.cvsignore b/.cvsignore index b6b722a..9bba22e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alexandria-0.6.5.tar.gz +alexandria_0.6.5+0.6.6alpha.orig.tar.gz diff --git a/alexandria-0.6.4.1-use-2args-bindtextdomain.patch b/alexandria-0.6.4.1-use-2args-bindtextdomain.patch deleted file mode 100644 index 8b875e6..0000000 --- a/alexandria-0.6.4.1-use-2args-bindtextdomain.patch +++ /dev/null @@ -1,472 +0,0 @@ -Index: lib/alexandria/models/library.rb -=================================================================== ---- lib/alexandria/models/library.rb (revision 1066) -+++ lib/alexandria/models/library.rb (revision 1067) -@@ -41,7 +41,7 @@ - - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a - include Observable -Index: lib/alexandria/book_providers/renaud.rb -=================================================================== ---- lib/alexandria/book_providers/renaud.rb (revision 1066) -+++ lib/alexandria/book_providers/renaud.rb (revision 1067) -@@ -24,7 +24,7 @@ - class BookProviders - class RENAUDProvider < GenericProvider - include GetText -- #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ #GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - BASE_URI = "http://www.renaud-bray.com/" - ACCENTUATED_CHARS = "áàâäçéèêëíìîïóòôöúùûü" - -Index: lib/alexandria/book_providers/amazon_aws.rb -=================================================================== ---- lib/alexandria/book_providers/amazon_aws.rb (revision 1066) -+++ lib/alexandria/book_providers/amazon_aws.rb (revision 1067) -@@ -25,7 +25,7 @@ - class AmazonProvider < GenericProvider - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - #CACHE_DIR = File.join(Alexandria::Library::DIR, '.amazon_cache') - -Index: lib/alexandria/book_providers/mcu.rb -=================================================================== ---- lib/alexandria/book_providers/mcu.rb (revision 1066) -+++ lib/alexandria/book_providers/mcu.rb (revision 1067) -@@ -27,7 +27,7 @@ - class MCUProvider < GenericProvider - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - LANGUAGES = { - 'es' => '1' -Index: lib/alexandria/book_providers/proxis.rb -=================================================================== ---- lib/alexandria/book_providers/proxis.rb (revision 1066) -+++ lib/alexandria/book_providers/proxis.rb (revision 1067) -@@ -23,7 +23,7 @@ - class ProxisProvider < GenericProvider - include GetText - include Logging -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - LANGUAGES = { - 'nl' => '1', -Index: lib/alexandria/book_providers/z3950.rb -=================================================================== ---- lib/alexandria/book_providers/z3950.rb (revision 1066) -+++ lib/alexandria/book_providers/z3950.rb (revision 1067) -@@ -26,7 +26,7 @@ - class Z3950Provider < AbstractProvider - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(name="Z3950", fullname="Z39.50") - super -@@ -174,7 +174,7 @@ - unabstract - - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize - super("LOC", _("Library of Congress (Usa)")) -@@ -207,7 +207,7 @@ - unabstract - - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize - super("BL", _("British Library")) -@@ -296,7 +296,7 @@ - unabstract - - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize - super("SBN", "Servizio Bibliotecario Nazionale (Italy)") -Index: lib/alexandria/book_providers.rb -=================================================================== ---- lib/alexandria/book_providers.rb (revision 1066) -+++ lib/alexandria/book_providers.rb (revision 1067) -@@ -25,7 +25,7 @@ - include Singleton - include Observable - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS, - SEARCH_BY_KEYWORD = (0..3).to_a -Index: lib/alexandria/import_library.rb -=================================================================== ---- lib/alexandria/import_library.rb (revision 1066) -+++ lib/alexandria/import_library.rb (revision 1067) -@@ -22,7 +22,7 @@ - - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def self.all - [ -Index: lib/alexandria/export_library.rb -=================================================================== ---- lib/alexandria/export_library.rb (revision 1066) -+++ lib/alexandria/export_library.rb (revision 1067) -@@ -102,7 +102,7 @@ - include GetText - include Logging - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def self.all - [ -Index: lib/alexandria/smart_library.rb -=================================================================== ---- lib/alexandria/smart_library.rb (revision 1066) -+++ lib/alexandria/smart_library.rb (revision 1067) -@@ -23,7 +23,7 @@ - include Logging - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - ALL_RULES, ANY_RULE = 1, 2 - attr_reader :name -@@ -290,7 +290,7 @@ - class Rule - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - attr_accessor :operand, :operation, :value - -@@ -343,7 +343,7 @@ - module Operands - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - LEFT = [ - LeftOperand.new(:title, _("Title"), String), -@@ -375,7 +375,7 @@ - include Logging - include GetText - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - IS_TRUE = Operator.new( - :is_true, -Index: lib/alexandria/about.rb -=================================================================== ---- lib/alexandria/about.rb (revision 1066) -+++ lib/alexandria/about.rb (revision 1067) -@@ -20,7 +20,7 @@ - TITLE = 'Alexandria' - TEXTDOMAIN = 'alexandria' - extend GetText -- bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - DESCRIPTION = _('A program to help you manage your book collection.') - COPYRIGHT = "Copyright (C) 2004,2005,2006 Laurent Sansonetti\n" + - "Copyright (C) 2007,2008,2009 Alexandria Contributors" -Index: lib/alexandria/ui/dialogs/misc_dialogs.rb -=================================================================== ---- lib/alexandria/ui/dialogs/misc_dialogs.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/misc_dialogs.rb (revision 1067) -@@ -19,7 +19,7 @@ - module UI - class ConflictWhileCopyingDialog < AlertDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, library, book) - super(parent, -@@ -42,7 +42,7 @@ - - class ReallyDeleteDialog < AlertDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, library, books=nil) - # Deleting a library. -Index: lib/alexandria/ui/dialogs/book_properties_dialog_base.rb -=================================================================== ---- lib/alexandria/ui/dialogs/book_properties_dialog_base.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/book_properties_dialog_base.rb (revision 1067) -@@ -20,7 +20,7 @@ - class BookPropertiesDialogBase < GladeBase - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - COVER_MAXWIDTH = 140 # pixels - -Index: lib/alexandria/ui/dialogs/new_book_dialog_manual.rb -=================================================================== ---- lib/alexandria/ui/dialogs/new_book_dialog_manual.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/new_book_dialog_manual.rb (revision 1067) -@@ -20,7 +20,7 @@ - class NewBookDialogManual < BookPropertiesDialogBase - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover") - def initialize(parent, library, &on_add_cb) -Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb -=================================================================== ---- lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb (revision 1067) -@@ -20,7 +20,7 @@ - class SmartLibraryPropertiesDialogBase < Gtk::Dialog - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - attr_reader :predicate_operator_rule - -Index: lib/alexandria/ui/dialogs/export_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/export_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/export_dialog.rb (revision 1067) -@@ -19,7 +19,7 @@ - module UI - class ConfirmEraseDialog < AlertDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, filename) - super(parent, _("File already exists"), -@@ -42,7 +42,7 @@ - class ExportDialog < Gtk::FileChooserDialog - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - FORMATS = Alexandria::ExportFormat.all - THEMES = Alexandria::WebTheme.all -Index: lib/alexandria/ui/dialogs/preferences_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/preferences_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/preferences_dialog.rb (revision 1067) -@@ -95,7 +95,7 @@ - - class ProviderPreferencesDialog < ProviderPreferencesBaseDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, provider) - super(_("Preferences for %s") % provider.fullname, -@@ -120,7 +120,7 @@ - - class NewProviderDialog < ProviderPreferencesBaseDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent) - super(_("New Provider"), -@@ -209,7 +209,7 @@ - class PreferencesDialog < GladeBase - include Alexandria::Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, &changed_block) - super('preferences_dialog.glade') -Index: lib/alexandria/ui/dialogs/new_book_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/new_book_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/new_book_dialog.rb (revision 1067) -@@ -26,7 +26,7 @@ - module UI - class KeepBadISBNDialog < AlertDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, book) - super(parent, _("Invalid ISBN '%s'") % book.isbn, -@@ -51,7 +51,7 @@ - include Logging - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, selected_library=nil, &block) - super('new_book_dialog.glade') -Index: lib/alexandria/ui/dialogs/new_smart_library_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/new_smart_library_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/new_smart_library_dialog.rb (revision 1067) -@@ -19,7 +19,7 @@ - module UI - class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, &block) - super(parent) -Index: lib/alexandria/ui/dialogs/book_properties_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/book_properties_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/book_properties_dialog.rb (revision 1067) -@@ -21,7 +21,7 @@ - include Logging - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, library, book) - super(parent, library.cover(book)) -Index: lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb (revision 1067) -@@ -19,7 +19,7 @@ - module UI - class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, smart_library, &block) - super(parent) -Index: lib/alexandria/ui/dialogs/acquire_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/acquire_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/acquire_dialog.rb (revision 1067) -@@ -213,7 +213,7 @@ - include GetText - include Logging - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def initialize(parent, selected_library=nil, &block) - super('acquire_dialog.glade') -Index: lib/alexandria/ui/dialogs/about_dialog.rb -=================================================================== ---- lib/alexandria/ui/dialogs/about_dialog.rb (revision 1066) -+++ lib/alexandria/ui/dialogs/about_dialog.rb (revision 1067) -@@ -19,7 +19,7 @@ - module UI - class AboutDialog < Gtk::AboutDialog - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - GPL = < "UTF-8") - - def initialize(parent, message) - super(parent, _("Error while importing"), -@@ -53,7 +53,7 @@ - include GetText - include Logging - -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - FILTERS = Alexandria::ImportFilter.all - -Index: lib/alexandria/ui/main_app.rb -=================================================================== ---- lib/alexandria/ui/main_app.rb (revision 1066) -+++ lib/alexandria/ui/main_app.rb (revision 1067) -@@ -43,7 +43,7 @@ - module UI - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - class MainApp - include Logging -Index: lib/alexandria/ui/listview.rb -=================================================================== ---- lib/alexandria/ui/listview.rb (revision 1066) -+++ lib/alexandria/ui/listview.rb (revision 1067) -@@ -20,7 +20,7 @@ - module UI - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - class ListViewManager - include Logging - include GetText -Index: lib/alexandria/ui/ui_manager.rb -=================================================================== ---- lib/alexandria/ui/ui_manager.rb (revision 1066) -+++ lib/alexandria/ui/ui_manager.rb (revision 1067) -@@ -24,7 +24,7 @@ - :iconview_model, :filtered_model, :on_books_selection_changed - include Logging - include GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - module Columns - COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS, -Index: lib/alexandria/ui/libraries_combo.rb -=================================================================== ---- lib/alexandria/ui/libraries_combo.rb (revision 1066) -+++ lib/alexandria/ui/libraries_combo.rb (revision 1067) -@@ -19,7 +19,7 @@ - class Gtk::ComboBox - include GetText - extend GetText -- GetText.bindtextdomain(Alexandria::TEXTDOMAIN, nil, nil, "UTF-8") -+ GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8") - - def populate_with_libraries(libraries, selected_library) - libraries_names = libraries.map { |x| x.name } diff --git a/alexandria-0.6.5-WorldCat-results.patch b/alexandria-0.6.5-WorldCat-results.patch deleted file mode 100644 index f11fda7..0000000 --- a/alexandria-0.6.5-WorldCat-results.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: lib/alexandria/book_providers/worldcat.rb -=================================================================== ---- lib/alexandria/book_providers/worldcat.rb (revision 1088) -+++ lib/alexandria/book_providers/worldcat.rb (revision 1089) -@@ -23,7 +23,11 @@ - # New WorldCat provider, taken from the Palatina MetaDataSource and - # modified to fit the structure of Alexandria book providers. - # (25 Feb 2009) -+# -+# Updated from Palatina, to reflect changes in the worldcat website. -+# (1 Sep 2009) - -+ - require 'cgi' - require 'alexandria/net' - -@@ -136,7 +140,17 @@ - raise NoResultsError - end - -- title_header = doc%'h1.item-title' -+ -+ if doc % 'table.table-results' -+ log.info { "Found multiple results for lookup: fetching first result only" } -+ search_results = parse_search_result_data(html) -+ first = search_results.first -+ rslt2 = transport.get_response(URI.parse(first[:url])) -+ html2 = rslt2.body -+ doc = Hpricot(html2) -+ end -+ -+ title_header = doc%'h1.title' - title = title_header.inner_text if title_header - unless title - log.warn { "Unexpected lack of title from WorldCat lookup" } -@@ -145,18 +159,25 @@ - log.info { "Found book #{title} at WorldCat" } - - authors = [] -- authors_div = doc%'div.item-author' -- if authors_div -- (authors_div/:a).each do |a| -+ authors_tr = doc%'tr#details-allauthors' -+ if authors_tr -+ (authors_tr/:a).each do |a| - authors << a.inner_text - end - end - - # can we do better? get the City name?? or multiple publishers? -- publisher_row = doc%'td.label[text()*=Publisher]/..' -+ bibdata = doc % 'div#bibdata' -+ bibdata_table = bibdata % :table -+ publisher_row = bibdata_table % 'th[text()*=Publisher]/..' -+ - if publisher_row - publication_info = (publisher_row/'td').last.inner_text -- publication_info =~ /:*([^;,]+)/ -+ if publication_info.index(':') -+ publication_info =~ /:[\s]*([^;,]+)/ -+ else -+ publication_info =~ /([^;,]+)/ -+ end - publisher = $1 - publication_info =~ /([12][0-9]{3})/ - year = $1.to_i if $1 -@@ -167,7 +188,7 @@ - - isbn = search_isbn - unless isbn -- isbn_row = doc%'td.label[text()*=ISBN]/..' -+ isbn_row = doc % 'tr#details-standardno' ##bibdata_table % 'th[text()*=ISBN]/..' - if isbn_row - isbns = (isbn_row/'td').last.inner_text.split - isbn = Library.canonicalise_isbn(isbns.first) diff --git a/alexandria-0.6.5-crash-in-turkish.patch b/alexandria-0.6.5-crash-in-turkish.patch deleted file mode 100644 index 645f830..0000000 --- a/alexandria-0.6.5-crash-in-turkish.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: lib/alexandria/ui/icons.rb -=================================================================== ---- lib/alexandria/ui/icons.rb (revision 1087) -+++ lib/alexandria/ui/icons.rb (revision 1088) -@@ -63,7 +63,9 @@ - def self.load_icon_images - Dir.entries(ICONS_DIR).each do |file| - next unless file =~ /\.png$/ # skip non '.png' files -- name = File.basename(file, ".png").upcase -+ # Don't use upcase and use tr instead -+ # For example in Turkish the upper case of 'i' is still 'i'. -+ name = File.basename(file, ".png").tr('a-z', 'A-Z') - const_set(name, Gdk::Pixbuf.new(File.join(ICONS_DIR, file))) - end - end diff --git a/alexandria-0.6.5-deastore-author-missing.patch b/alexandria-0.6.5-deastore-author-missing.patch deleted file mode 100644 index e662185..0000000 --- a/alexandria-0.6.5-deastore-author-missing.patch +++ /dev/null @@ -1,115 +0,0 @@ -Index: lib/alexandria/book_providers/deastore.rb -=================================================================== ---- lib/alexandria/book_providers/deastore.rb (revision 1086) -+++ lib/alexandria/book_providers/deastore.rb (revision 1087) -@@ -49,12 +49,18 @@ - def get_book_from_search_result(result) - log.debug { "Fetching book from #{result[:url]}" } - html_data = agent.get(result[:url]) -+ #File.open("rsltflarn#{Time.now().usec()}.html", 'wb') do |f| -+ # f.write(html_data.body) -+ #end - parse_result_data(html_data.body) - end - - def search(criterion, type) - criterion = criterion.convert("ISO-8859-1", "UTF-8") # still needed?? - html_data = agent.get(create_search_uri(type, criterion)) -+ #File.open("flarn#{Time.now().usec()}.html", 'wb') do |f| -+ # f.write(html_data.body) -+ #end - results = parse_search_result_data(html_data.body) - raise NoResultsError if results.empty? - -@@ -89,7 +95,9 @@ - search_term_encoded = CGI.escape(search_term) - end - -- BASE_SEARCH_URL % [search_type_code, search_term_encoded] -+ uri = BASE_SEARCH_URL % [search_type_code, search_term_encoded] -+ log.debug { uri } -+ uri - end - - def parse_search_result_data(html) -@@ -109,13 +117,21 @@ - # p Data di pubblicazione: \n 2009 - # p.prezzo (price) - -- cover_url = '' -- cover_images = div/'a/img' -- unless cover_images.empty? -- img = cover_images.first -- image_url = img['src'] -- cover_url = "#{SITE}#{image_url}" -- end -+# cover_url = '' -+# cover_images = div/'a/img' -+# unless cover_images.empty? -+# img = cover_images.first -+# image_url = img['src'] -+# if image_url =~ /^http/ -+# cover_url = '' # image_url -+# elsif image_url[0..0] != '/' -+# cover_url = "#{SITE}/#{image_url}" -+# else -+# cover_url = "#{SITE}#{image_url}" -+# end -+# log.debug { "Search Cover Image URL #{cover_url}" } -+ -+# end - - content = div/'div.scheda_content' - title_link = (content/:a).first -@@ -167,12 +183,17 @@ - end - - # author(s) -+ authors = [] - author_span = data%'span.int_scheda[text()*=Autore]' -- author_links = author_span/'a.info' -- authors = [] -- author_links.each do |link| -- authors << normalize(link.inner_text) -+ unless author_span -+ author_span = data%'span.int_scheda[text()*=cura]' # editor - end -+ if author_span -+ author_links = author_span/'a.info' -+ author_links.each do |link| -+ authors << normalize(link.inner_text) -+ end -+ end - - # publisher - publisher_par = data%'span.int_scheda[text()*=Editore]/..' -@@ -231,7 +252,19 @@ - #cover - image_url = nil - if cover_link -- image_url = "#{SITE}#{cover_link}" -+ if cover_link =~ /^http/ -+ # e.g. http://images.btol.com/ContentCafe/Jacket.aspx?\ -+ # Return=1&Type=M&Value=9788873641803&password=\ -+ # CC70580&userID=DEA40305 -+ # seems not to work, or to be blank anyway, so set to nil -+ image_url = nil -+ elsif cover_link[0..0] != '/' -+ image_url = "#{SITE}/#{cover_link}" -+ else -+ image_url = "#{SITE}#{cover_link}" -+ end -+ -+ log.debug { "Cover Image URL:: #{image_url}" } - end - - book = Book.new(title, authors, isbn, publisher, publish_year, binding) -@@ -239,7 +272,7 @@ - return [book, image_url] - rescue Exception => ex - trace = ex.backtrace.join("\n> ") -- log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" } -+ log.error { "Failed parsing DeaStore product page #{ex.message}\n#{trace}" } - return nil - end - end diff --git a/alexandria-0.6.5-glib_convert-syntax.patch b/alexandria-0.6.5-glib_convert-syntax.patch deleted file mode 100644 index 8f373ab..0000000 --- a/alexandria-0.6.5-glib_convert-syntax.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: lib/alexandria/utils.rb -=================================================================== ---- lib/alexandria/utils.rb (revision 1085) -+++ lib/alexandria/utils.rb (revision 1086) -@@ -15,51 +15,17 @@ - # write to the Free Software Foundation, Inc., 51 Franklin Street, - # Fifth Floor, Boston, MA 02110-1301 USA. - --#begin - require 'glib2' - - class String -- def convert(charset_from, charset_to) -- GLib.convert(self, charset_from, charset_to) -+ -+ # Converts this string into the desired charset. -+ # -+ # Note that this may raise a GLib::ConvertError if the -+ # desired_charset cannot accommodate all the characters present in -+ # the string, e.g. trying to convert Japanese Kanji to ISO-8859-1 -+ # will obviously not work. -+ def convert(desired_charset, source_data_charset) -+ GLib.convert(self, desired_charset, source_data_charset) - end - end -- --=begin --rescue LoadError -- -- # We assume that Ruby/Cocoa is loaded there -- -- #require 'iconv' -- -- class String -- def to_utf8_nsstring -- # This should be writen in ObjC in order to catch the ObjC exception if the -- # string could not be converted to UTF8. -- (OSX::NSString.stringWithUTF8String(self) or self) -- end -- -- def convert(charset_from, charset_to) -- # Do nothing for the moment... -- self -- end -- -- return OSX::NSString.stringWithUTF8String(self) -- x = Iconv.iconv(charset_to, charset_from, self).first -- p "#{self} -> #{x}" -- return x -- #p charset_from, charset_to -- #return self -- -- from = OSX::NSString.alloc.initWithString(self) -- encoding = charset_to.nsencoding -- encoding = OSX::NSUnicodeStringEncoding -- data = from.dataUsingEncoding(encoding) -- s = OSX::NSString.alloc.initWithData_encoding(data, encoding).to_s -- s -- #self -- end -- -- end -- --end --=end diff --git a/alexandria-0.6.5-search-result-sanity-check.patch b/alexandria-0.6.5-search-result-sanity-check.patch deleted file mode 100644 index 2121449..0000000 --- a/alexandria-0.6.5-search-result-sanity-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: lib/alexandria/book_providers.rb -=================================================================== ---- lib/alexandria/book_providers.rb (revision 1086) -+++ lib/alexandria/book_providers.rb (revision 1087) -@@ -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.nil? } -+ - if results.length == 0 - self.instance.changed - self.instance.notify_observers(:not_found, factory.fullname) # new diff --git a/alexandria-0.6.6alpha1-installprefix.patch b/alexandria-0.6.6alpha1-installprefix.patch new file mode 100644 index 0000000..423a3f1 --- /dev/null +++ b/alexandria-0.6.6alpha1-installprefix.patch @@ -0,0 +1,22 @@ +--- alexandria-0.6.5+0.6.6alpha/Rakefile.prefix 2009-12-17 02:21:21.000000000 +0900 ++++ alexandria-0.6.5+0.6.6alpha/Rakefile 2009-12-17 02:30:48.000000000 +0900 +@@ -19,8 +19,9 @@ + + stage_dir = ENV['DESTDIR'] || 'tmp' + ++INSTALL_PREFIX = ENV['install_prefix'] + PROJECT='alexandria' +-PREFIX='/usr' ++PREFIX="#{INSTALL_PREFIX}/usr" + SHARE = "#{PREFIX}/share" + + DATA_VERSION = '0.6.3' +@@ -41,7 +42,7 @@ + debinstall = FileInstallTask.new(:debian_install, stage_dir, true) do |i| + + i.install_exe('bin', 'bin/*', "#{PREFIX}/bin") +- i.install('lib', 'lib/**/*.rb', i.rubylib) ++ i.install('lib', 'lib/**/*.rb', "#{INSTALL_PREFIX}" + i.rubylib) + + share_files = ['data/alexandria/**/*', 'data/gnome/**/*.*', + 'data/locale/**/*.mo', 'data/omf/**/*.omf', diff --git a/alexandria.spec b/alexandria.spec index 103a8b2..ed1f6e2 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -2,10 +2,11 @@ %define rubyabi 1.8 %define repoid 62178 -%define majorver 0.6.5 -%undefine minorver +%define prevver 0.6.5 +%define majorver 0.6.6 +%define minorver alpha -%define fedorarel 7 +%define fedorarel 1 %define rel %{?minorver:0.}%{fedorarel}%{?minorver:.%minorver} @@ -18,26 +19,14 @@ Summary: Book collection manager Group: Applications/Productivity License: GPLv2+ URL: http://alexandria.rubyforge.org/ -Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz +#Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{name}-%{version}%{?minorver}.tar.gz +Source0: https://launchpad.net/~alexandria-team/+archive/ppa/+files/%{name}_%{prevver}+%{version}%{?minorver}.orig.tar.gz # 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 -# Clarify the usage of GLib.convert -# ref: alexandria-Bugs-26968 -Patch3: alexandria-0.6.5-glib_convert-syntax.patch -# Add some sanity check for search results -# ref: alexandria-Bugs-27000 -Patch4: alexandria-0.6.5-search-result-sanity-check.patch -# Fix for DeaStore search engine where search result does not -# contain Author item -# ref: alexandria-Bugs-27000 -Patch5: alexandria-0.6.5-deastore-author-missing.patch -# Alexandria crashes in tr_TR.UTF-8 on startup -# RH bug 520170, alexandria-Bugs-27015 -Patch6: alexandria-0.6.5-crash-in-turkish.patch -# Fix for parsing WorldCat search result -# ref: alexandria-Bugs-27028 -Patch7: alexandria-0.6.5-WorldCat-results.patch +# Add install_prefix +# Will ask upstream +Patch10: alexandria-0.6.6alpha1-installprefix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -86,23 +75,19 @@ Requires(preun): GConf2 Alexandria is a GNOME application to help you manage your book collection. %prep -%setup -q -n %{name}-%{majorver}%{?minorver} +#%%setup -q -n %{name}-%{majorver}%{?minorver} +%setup -q -n %{name}-%{prevver}+%{majorver}%{?minorver} %patch2 -p0 -b .up25348 -%patch3 -p0 -b .glib -%patch4 -p0 -b .sanity -%patch5 -p0 -b .deastore -%patch6 -p0 -b .tr_TR -%patch7 -p0 -b .worldcat +%patch10 -p1 -b .prefix # Embed Fedora EVR %{__sed} -i.evr \ - -e "s|\(b.display_version = \).*$|\1'%{version}-%{release}'|" \ + -e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \ Rakefile %build rake build - %install %{__rm} -rf $RPM_BUILD_ROOT @@ -114,10 +99,11 @@ rake build %{__ln_s} -f /bin/true tmpbin/gtk-update-icon-cache export PATH="$(pwd)/tmpbin:$PATH" +export RUBYLIBDIR=%{ruby_sitelib} #export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -export PREFIX=$RPM_BUILD_ROOT%{_prefix} -rake install +rake install \ + install_prefix=$RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/ desktop-file-install \ @@ -134,12 +120,11 @@ for s in 64 128 ; do $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/%{name}.png done -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/ -%{__install} -c -p -m 0644 schemas/%{name}.schemas \ - $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/ - -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/locale/ -%{__cp} -pr data/locale/* $RPM_BUILD_ROOT%{_datadir}/locale/ +# Move gconf files to where Fedora uses +%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir} +%{__mv} \ + $RPM_BUILD_ROOT%{_datadir}/gconf/ \ + $RPM_BUILD_ROOT%{_sysconfdir}/ # Clean up documents %{__rm} -rf $RPM_BUILD_ROOT%{_defaultdocdir} @@ -148,6 +133,9 @@ done # Removing for Fedora %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/menu/ +# Cleanups +%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/ + %find_lang %{name} %clean @@ -219,6 +207,12 @@ exit 0 %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Thu Dec 17 2009 Mamoru Tasaka - 0.6.6-0.1.alpha +- Try 0.6.6 alpha + +* Tue Sep 8 2009 Mamoru Tasaka +- Wrong patch of sanity check patch applied on F-10/11, fixing... + * Wed Sep 2 2009 Mamoru Tasaka - 0.6.5-7 - Fix for parsing WorldCat provider search result (alexandria-Bugs-27028) diff --git a/sources b/sources index 8fc6d4e..eda5f1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c8655f361e6a0c6f8cdc97f36bd2d0f alexandria-0.6.5.tar.gz +3ef83d89d92b4160f78a42e83c8e3890 alexandria_0.6.5+0.6.6alpha.orig.tar.gz