diff --git a/alexandria-0.7.9-yaml-unescape.patch b/alexandria-0.7.9-yaml-unescape.patch index 0b2c42a..05aa848 100644 --- a/alexandria-0.7.9-yaml-unescape.patch +++ b/alexandria-0.7.9-yaml-unescape.patch @@ -33,17 +33,16 @@ old_isbn = book.isbn old_pub_year = book.publishing_year begin -@@ -181,6 +196,9 @@ module Alexandria +@@ -181,6 +196,8 @@ module Alexandria private def regularize_book_from_yaml(name) -+ require 'syck/constants' + require 'syck/encoding' + text = File.read(name) # Code to remove the mystery string in books imported from Amazon -@@ -203,7 +221,7 @@ module Alexandria +@@ -203,7 +220,7 @@ module Alexandria end - book = Book.from_yaml(text) diff --git a/alexandria.spec b/alexandria.spec index 38aa9f4..977b7fc 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,20 +7,17 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 12 +%define baserelease 3 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 Summary: Book collection manager -# Overall GPL-2.0-or-later -# share/gnome/help/alexandria/C/alexandria.xml GFDL-1.2-or-later -# SPDX confirmed -License: GPL-2.0-or-later AND GPL-2.0-or-later +License: GPLv2+ URL: https://github.com/mvz/alexandria-book-collection-manager/ Source0: %{url}/archive/v%{version}/%{name}-%{version}%{?minorver:-%{minorver}}.tar.gz # Patches discussing with the upstream @@ -106,7 +103,9 @@ BuildRequires: intltool BuildRequires: rubygem(rspec) # Needed since Ruby 3.0. # https://github.com/mvz/alexandria-book-collection-manager/issues/124 +%if 0%{?fedora} >= 34 %BothRequires rubygem(rexml) +%endif # rspec test BuildRequires: %{_bindir}/xvfb-run BuildRequires: %{_bindir}/ping @@ -164,25 +163,25 @@ Alexandria is a GNOME application to help you manage your book collection. %setup -q -n %{name}-book-collection-manager-%{majorver}%{?minorver:-%{?minorver}} # Check if patch2 issue is fixed in rev 1154 -#%%patch -P2 -p0 -b .up25348 -%patch -P3 -p1 -b .up28263.isdn -#%%patch -P4 -p0 -b .up29479.search -%patch -P14 -p1 -b .ascii -Z -#%%patch -P15 -p1 -b .kcodefix -%patch -P18 -p1 -b .ruby19_utf8 -Z -%patch -P19 -p1 -b .export_html -Z -%patch -P20 -p1 -b .export_csv -Z -%patch -P21 -p1 -b .icon_kanji -Z -%patch -P22 -p1 -b .broken_yaml -Z -%patch -P23 -p1 -b .delete_yaml -Z -%patch -P25 -p1 -b .nothread -Z -%patch -P26 -p1 -b .z3950_count -Z -#%%patch -P27 -p1 -b .negative -Z -%patch -P29 -p1 -b .gettext -Z -%patch -P30 -p1 -b .utf8_2 -Z -%patch -P31 -p1 -b .undefined_method -Z -%patch -P32 -p1 -b .reset_search -Z -%patch -P33 -p1 -b .image_size -Z +#%%patch2 -p0 -b .up25348 +%patch3 -p1 -b .up28263.isdn +#%%patch4 -p0 -b .up29479.search +%patch14 -p1 -b .ascii -Z +#%%patch15 -p1 -b .kcodefix +%patch18 -p1 -b .ruby19_utf8 -Z +%patch19 -p1 -b .export_html -Z +%patch20 -p1 -b .export_csv -Z +%patch21 -p1 -b .icon_kanji -Z +%patch22 -p1 -b .broken_yaml -Z +%patch23 -p1 -b .delete_yaml -Z +%patch25 -p1 -b .nothread -Z +%patch26 -p1 -b .z3950_count -Z +#%%patch27 -p1 -b .negative -Z +%patch29 -p1 -b .gettext -Z +%patch30 -p1 -b .utf8_2 -Z +%patch31 -p1 -b .undefined_method -Z +%patch32 -p1 -b .reset_search -Z +%patch33 -p1 -b .image_size -Z # Part of https://github.com/mvz/alexandria-book-collection-manager/commit/d9116e99242c209129bf09c3c1ad9a4ff6fdcf44 # Needed for ruby3.2 - removes File.exists? @@ -297,9 +296,6 @@ touch FAKE/bundler/setup.rb touch FAKE/simplecov.rb export RUBYLIB=$(pwd)/FAKE -# Disable z3950 provider test -disable_test spec/alexandria/book_providers/bl_provider_spec.rb "works" - ping -w3 www.google.co.jp && \ { # Need taking a look at this @@ -309,6 +305,7 @@ ping -w3 www.google.co.jp && \ || \ { disable_test spec/alexandria/book_providers/thalia_provider_spec.rb "works when searching by ISBN"; + disable_test spec/alexandria/book_providers/bl_provider_spec.rb "works"; disable_test spec/alexandria/book_providers/loc_provider_spec.rb "works for a book"; disable_test spec/alexandria/book_providers/sbn_provider_spec.rb "works"; sed -i spec/alexandria/book_providers_spec.rb -e "\@Alexandria::BookProviders::SBNProvider@{n;s|it|xit|}"; @@ -333,7 +330,7 @@ done %gconf_schema_remove %{name} %files -f %{name}.lang -%license COPYING +%doc COPYING %doc ChangeLog* %doc INSTALL.md %doc README* @@ -359,33 +356,6 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 0.7.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 0.7.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.7.9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Nov 16 2024 Mamoru TASAKA - 0.7.9-9 -- Add missing syck file import (bug 2326632) - -* Wed Jul 17 2024 Fedora Release Engineering - 0.7.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 0.7.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0.7.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Jan 2 2024 Mamoru TASAKA - 0.7.9-5 -- SPDX migration - -* Fri Dec 22 2023 Mamoru TASAKA - 0.7.9-4 -- Disable z3950x provider test - * Wed Jul 19 2023 Fedora Release Engineering - 0.7.9-3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild