Switch to image_size gem, specify explicitly

Disable 1 failing test
This commit is contained in:
Mamoru TASAKA 2021-08-27 11:18:08 +09:00
commit 60302143ca
2 changed files with 27 additions and 21 deletions

View file

@ -0,0 +1,10 @@
--- alexandria-book-collection-manager-0.7.8/lib/alexandria/export_library.rb.image_size 2020-11-29 20:50:34.000000000 +0900
+++ alexandria-book-collection-manager-0.7.8/lib/alexandria/export_library.rb 2021-08-27 11:09:49.794917238 +0900
@@ -5,6 +5,7 @@
# See the file README.md for authorship and licensing information.
require "csv"
+gem "image_size"
require "image_size"
require "tmpdir"

View file

@ -7,14 +7,14 @@ BuildRequires: %{*} \
%undefine minorver
%undefine ifpre
%define fedorarel 5
%define fedorarel 6
%define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver}
Name: alexandria
Version: %{majorver}
Release: %{rel}%{?dist}.1
Release: %{rel}%{?dist}
Summary: Book collection manager
License: GPLv2+
@ -82,6 +82,8 @@ Patch31: alexandria-0.7.4-remove-undefined-method.patch
# Once reset search text when adding new book (bug 1909500)
# https://github.com/mvz/alexandria-book-collection-manager/issues/106
Patch32: alexandria-0.7.8-reset-search-when-adding-new-book.patch
# Explicitly specify image_size gem
Patch33: alexandria-0.7.8-explicitly-specify_gem_image_size.patch
BuildArch: noarch
@ -120,8 +122,7 @@ BuildRequires: gstreamer1-plugins-good
%BothRequires rubygem(gettext)
%BothRequires rubygem(hpricot)
%BothRequires rubygem(htmlentities)
# TODO: alexandria now uses toy/image_size, need new review request
%BothRequires ruby(imagesize)
%BothRequires rubygem(image_size)
# Dependency removed on 0.6.4b1
#Requires: ruby(mechanize)
# Kill ruby(revolution) dependency
@ -180,6 +181,7 @@ Alexandria is a GNOME application to help you manage your book collection.
%patch30 -p1 -b .utf8_2
%patch31 -p1 -b .undefined_method
%patch32 -p1 -b .reset_search
%patch33 -p1 -b .image_size
# Embed Fedora EVR
%{__sed} -i.evr \
@ -207,9 +209,6 @@ rake install_package_staging \
RUBYLIBDIR=%{ruby_vendorlibdir}
desktop-file-install \
%if 0%{?fedora} < 19
--vendor fedora \
%endif
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@ -293,7 +292,13 @@ touch FAKE/bundler/setup.rb
touch FAKE/simplecov.rb
export RUBYLIB=$(pwd)/FAKE
ping -w3 www.google.co.jp || \
ping -w3 www.google.co.jp && \
{
# This does not work, will be fixed in 0.7.9
# book_providers/web.rb: switching from Hpricot to Nokogiri seems needed
disable_test spec/alexandria/book_providers/thalia_provider_spec.rb "works when searching by ISBN";
} \
|| \
{
disable_test spec/alexandria/book_providers/thalia_provider_spec.rb "works when searching by ISBN";
disable_test spec/alexandria/book_providers_spec.rb "works for a book with ASCII title";
@ -301,19 +306,6 @@ ping -w3 www.google.co.jp || \
sed -i spec/alexandria/book_providers_spec.rb -e "\@Alexandria::BookProviders::SBNProvider@{n;s|it|xit|}";
}
# This one need image_size (not old imagesize)
# Comment:
%if 0
1) Alexandria::ExportLibrary#export_as_tellico_xml_archive can export unsorted
Failure/Error: image.add_attribute("format", image_s.format)
NoMethodError:
private method `format' called for #<ImageSize:0x00005651fefc6fb0>
# ./lib/alexandria/export_library.rb:257:in `block in to_tellico_document'
%endif
sed -i.testsuite spec/alexandria/export_library_spec.rb \
-e "\@message.*export_as_tellico_xml_archive@{n;n;s|it|xit|}"
xvfb-run \
-s "-screen 0 640x480x24" \
rake spec:unit
@ -359,6 +351,10 @@ done
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%changelog
* Fri Aug 27 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.7.8-6
- Switch to image_size gem, specify explicitly
- Disable 1 failing test
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.8-5.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild