From 1e57f5d8799fafcdafa5e8bf4f51618549a48ed9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 17 Jan 2022 13:38:25 -0800 Subject: [PATCH 01/20] Rebuild for hiredis 1.0.2 --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 861093b..d16eaec 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -14,7 +14,7 @@ BuildRequires: %{*} \ Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 Summary: Book collection manager License: GPLv2+ @@ -351,6 +351,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Mon Jan 17 2022 Kevin Fenzi - 0.7.8-6.1 +- Rebuild for hiredis 1.0.2 + * Fri Aug 27 2021 Mamoru TASAKA - 0.7.8-6 - Switch to image_size gem, specify explicitly - Disable 1 failing test From 9a9d8197e961719304d1ed27f2fb512d403fa89b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:06:14 +0000 Subject: [PATCH 02/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index d16eaec..b85ea6d 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -14,7 +14,7 @@ BuildRequires: %{*} \ Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 Summary: Book collection manager License: GPLv2+ @@ -351,6 +351,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.7.8-6.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Jan 17 2022 Kevin Fenzi - 0.7.8-6.1 - Rebuild for hiredis 1.0.2 From 52e3400d083ddc8189933655f1298d5103bda928 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 27 Feb 2022 21:09:36 +0900 Subject: [PATCH 03/20] Update to 0.7.9 --- ....patch => alexandria-0.7.9-ascii-fix.patch | 4 +- ...tch => alexandria-0.7.9-utf8-convert.patch | 6 +- ...ch => alexandria-0.7.9-yaml-unescape.patch | 8 +-- ...=> alexandria-0.7.9-z3950-zoom-count.patch | 4 +- alexandria.spec | 66 ++++++++++--------- 5 files changed, 45 insertions(+), 43 deletions(-) rename alexandria-0.7.4-ascii-fix.patch => alexandria-0.7.9-ascii-fix.patch (88%) rename alexandria-0.7.4-utf8-convert.patch => alexandria-0.7.9-utf8-convert.patch (88%) rename alexandria-0.7.6-yaml-unescape.patch => alexandria-0.7.9-yaml-unescape.patch (86%) rename alexandria-0.7.4-z3950-zoom-count.patch => alexandria-0.7.9-z3950-zoom-count.patch (84%) diff --git a/alexandria-0.7.4-ascii-fix.patch b/alexandria-0.7.9-ascii-fix.patch similarity index 88% rename from alexandria-0.7.4-ascii-fix.patch rename to alexandria-0.7.9-ascii-fix.patch index abda240..4c9082a 100644 --- a/alexandria-0.7.4-ascii-fix.patch +++ b/alexandria-0.7.9-ascii-fix.patch @@ -4,8 +4,8 @@ rule ".omf" => [".omf.in"] do |t| path = File.join(@gnome_helpfiles_dir, @projectname, locale_for(t.name), "#{@projectname}.xml") -- data = IO.read(t.source) -+ data = IO.read(t.source, :encoding => "BINARY") +- data = File.read(t.source) ++ data = File.read(t.source, :encoding => "BINARY") data.sub!(/PATH_TO_DOC_FILE/, path) puts "Generating #{t.name}..." - File.open(t.name, "w") { |io| io.puts data } diff --git a/alexandria-0.7.4-utf8-convert.patch b/alexandria-0.7.9-utf8-convert.patch similarity index 88% rename from alexandria-0.7.4-utf8-convert.patch rename to alexandria-0.7.9-utf8-convert.patch index 2def0c9..b6b4249 100644 --- a/alexandria-0.7.4-utf8-convert.patch +++ b/alexandria-0.7.9-utf8-convert.patch @@ -8,8 +8,8 @@ + # prevent crash... super(parent, format(_("The book '%s' already exists in '%s'. Would you like " \ -- "to replace it?"), book.title, library.name), -+ "to replace it?"), book.title, library.name).dup.force_encoding("UTF-8"), +- "to replace it?"), book.title, library.name), ++ "to replace it?"), book.title, library.name).dup.force_encoding("UTF-8"), Gtk::Stock::DIALOG_QUESTION, [[_("_Skip"), Gtk::ResponseType::CANCEL], [_("_Replace"), Gtk::ResponseType::OK]], @@ -22,7 +22,7 @@ - iter[Columns::AUTHORS] = book.authors.join(", ") + # Don't know why, however force_encoding seems needed here to + # prevent crash... -+ iter[Columns::AUTHORS] = book.authors.dup.map!{|str| str.force_encoding("UTF-8")}.join(", ") ++ iter[Columns::AUTHORS] = book.authors.dup.map!{|str| str.dup.force_encoding("UTF-8")}.join(", ") iter[Columns::ISBN] = book.isbn.to_s iter[Columns::PUBLISHER] = book.publisher iter[Columns::PUBLISH_DATE] = book.publishing_year.to_s diff --git a/alexandria-0.7.6-yaml-unescape.patch b/alexandria-0.7.9-yaml-unescape.patch similarity index 86% rename from alexandria-0.7.6-yaml-unescape.patch rename to alexandria-0.7.9-yaml-unescape.patch index d2a0a36..05aa848 100644 --- a/alexandria-0.7.6-yaml-unescape.patch +++ b/alexandria-0.7.9-yaml-unescape.patch @@ -39,15 +39,15 @@ def regularize_book_from_yaml(name) + require 'syck/encoding' + - text = IO.read(name) + text = File.read(name) # Code to remove the mystery string in books imported from Amazon @@ -203,7 +220,7 @@ module Alexandria end - # TODO: Ensure book loading passes through Book#initialize -- book = YAML.safe_load(text, permitted_classes: [Book, Time]) -+ book = YAML.safe_load(Syck::unescape(text), permitted_classes: [Book, Time]) +- book = Book.from_yaml(text) ++ book = Book.from_yaml(Syck::unescape(text)) unless book.isbn.instance_of? String # HACK + md = /isbn: (.+)/.match(text) diff --git a/alexandria-0.7.4-z3950-zoom-count.patch b/alexandria-0.7.9-z3950-zoom-count.patch similarity index 84% rename from alexandria-0.7.4-z3950-zoom-count.patch rename to alexandria-0.7.9-z3950-zoom-count.patch index ec82c15..8bba797 100644 --- a/alexandria-0.7.4-z3950-zoom-count.patch +++ b/alexandria-0.7.9-z3950-zoom-count.patch @@ -1,5 +1,5 @@ ---- alexandria-book-collection-manager-0.7.4/lib/alexandria/book_providers/z3950.rb.zoom_count 2019-10-25 01:20:07.000000000 +0900 -+++ alexandria-book-collection-manager-0.7.4/lib/alexandria/book_providers/z3950.rb 2020-01-04 13:59:39.224201295 +0900 +--- alexandria-book-collection-manager-0.7.4/lib/alexandria/book_providers/z3950_provider.rb.zoom_count 2019-10-25 01:20:07.000000000 +0900 ++++ alexandria-book-collection-manager-0.7.4/lib/alexandria/book_providers/z3950_provider.rb 2020-01-04 13:59:39.224201295 +0900 @@ -149,7 +149,11 @@ module Alexandria conn.preferred_record_syntax = prefs["record_syntax"] diff --git a/alexandria.spec b/alexandria.spec index b85ea6d..05de6f6 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -3,18 +3,18 @@ Requires: %{*} \ BuildRequires: %{*} \ %{nil} -%define majorver 0.7.8 +%define majorver 0.7.9 %undefine minorver %undefine ifpre -%define fedorarel 6 +%define fedorarel 1 %define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver} Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist}.2 +Release: %{rel}%{?dist} Summary: Book collection manager License: GPLv2+ @@ -36,7 +36,7 @@ Patch3: alexandria-0.7.4-dont_use_thread_when_adding_file_by_isdn.patch # Upstream patches # Patches not submitted to the upstream # Force encoding type to make rake happy -Patch14: alexandria-0.7.4-ascii-fix.patch +Patch14: alexandria-0.7.9-ascii-fix.patch # Fix kcode issues with 1.9 # Well, with the original fix, some strange failure on startup # happens on ja_JP.utf8... @@ -45,7 +45,7 @@ Patch14: alexandria-0.7.4-ascii-fix.patch # a. loading yaml file generated by ruby 18x will show garbage characters # b. moving book entry to another library which also contains the # same book will cause crash.. -Patch18: alexandria-0.7.4-utf8-convert.patch +Patch18: alexandria-0.7.9-utf8-convert.patch # More UTF-8 fix on ruby 1.9, when exporting library to HTML # (bug 819188) Patch19: alexandria-0.7.4-export-to-HTML-with-ruby19.patch @@ -58,7 +58,7 @@ Patch21: alexandria-0.7.4-iconview-multibyte.patch # (this file) and other. Also handle broken yaml file correctly and let # user redownload it # (bug 861740) -Patch22: alexandria-0.7.6-yaml-unescape.patch +Patch22: alexandria-0.7.9-yaml-unescape.patch # Add a feature to remove broken yaml files at startup when requested # (bug 869556) Patch23: alexandria-0.7.4-delete-broken-yaml.patch @@ -66,11 +66,12 @@ Patch23: alexandria-0.7.4-delete-broken-yaml.patch Patch25: alexandria-0.7.6-newbook-nothread.patch # Make z3950 provider work # ZOOM::Connection.count must be string -Patch26: alexandria-0.7.4-z3950-zoom-count.patch +Patch26: alexandria-0.7.9-z3950-zoom-count.patch # Read negative value as integer in case position has such value # (bug 1014295) # https://github.com/mvz/alexandria-book-collection-manager/issues/135 -Patch27: alexandria-0.7.6-negative-value.patch +# Applied in 0.7.9 +#Patch27: alexandria-0.7.6-negative-value.patch # Specify goocanvas version (bug 1024931) # This is obsolete with 0.7.4. 0.7.4 uses goocanvas2 with introspection # Make glade2 translatable text actually translated (i10ned) @@ -115,18 +116,17 @@ BuildRequires: gstreamer1-plugins-base # autoaudiosink BuildRequires: gstreamer1-plugins-good -# Amazon AWS v3 -> v4 switch -# AWS v4 is supported by alexandria itself -# But hpricot is still needed +# 0.7.9 uses nokogiri instead of hpricot #Requires: ruby(amazon) %BothRequires rubygem(gettext) -%BothRequires rubygem(hpricot) %BothRequires rubygem(htmlentities) %BothRequires rubygem(image_size) +%BothRequires rubygem(nokogiri) # Dependency removed on 0.6.4b1 #Requires: ruby(mechanize) # Kill ruby(revolution) dependency #Requires: ruby(revolution) +%BothRequires rubygem(psych) # ruby(zoom) -> rubygem(zoom) switch #Requires: ruby(zoom) @@ -166,22 +166,22 @@ Alexandria is a GNOME application to help you manage your book collection. #%%patch2 -p0 -b .up25348 %patch3 -p1 -b .up28263.isdn #%%patch4 -p0 -b .up29479.search -%patch14 -p1 -b .ascii +%patch14 -p1 -b .ascii -Z #%%patch15 -p1 -b .kcodefix -%patch18 -p1 -b .ruby19_utf8 -%patch19 -p1 -b .export_html -%patch20 -p1 -b .export_csv -%patch21 -p1 -b .icon_kanji -%patch22 -p1 -b .broken_yaml -%patch23 -p1 -b .delete_yaml -%patch25 -p1 -b .nothread -%patch26 -p1 -b .z3950_count -%patch27 -p1 -b .negative -%patch29 -p1 -b .gettext -%patch30 -p1 -b .utf8_2 -%patch31 -p1 -b .undefined_method -%patch32 -p1 -b .reset_search -%patch33 -p1 -b .image_size +%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 # Embed Fedora EVR %{__sed} -i.evr \ @@ -294,15 +294,14 @@ export RUBYLIB=$(pwd)/FAKE 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"; + true; } \ || \ { 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"; - disable_test spec/alexandria/book_providers_spec.rb "works for a book with a title with non-ASCII letter"; + 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|}"; } @@ -351,6 +350,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sun Feb 27 2022 Mamoru TASAKA - 0.7.9-1 +- 0.7.9 + * Wed Jan 19 2022 Fedora Release Engineering - 0.7.8-6.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0d3cb1fd23fc557e62668eba5c1756f67252bfc8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 27 Feb 2022 21:10:35 +0900 Subject: [PATCH 04/20] upload source --- .gitignore | 10 +--------- sources | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 32c2535..52ef19e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -alexandria-0.6.6.tar.gz -/alexandria-0.6.6-svn1154_trunk.tar.gz -/alexandria-0.6.7.tar.gz -/alexandria-0.6.8.tar.gz -/alexandria-0.6.9.tar.gz -/alexandria-0.7.4.tar.gz -/alexandria-0.7.5.tar.gz -/alexandria-0.7.6.tar.gz -/alexandria-0.7.8.tar.gz +/alexandria-*.tar.gz diff --git a/sources b/sources index 4b10561..b0c7759 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alexandria-0.7.8.tar.gz) = 0ccfc2af070267e15681973721e3d59ae5b23a069bcb0de04cabbd20bf46d7548c62b5b5b9a4c99554f942b78b3a7a97f4821666c58b37be13ee501e68d0012d +SHA512 (alexandria-0.7.9.tar.gz) = c1619b68778c1b94b6dff32c7be698afe29488c96c1719fcf65b6a03b3078c58053a5e76e9771a00a06dc654f95329af381c6659521f137df8eccca351811a18 From 877ceffb5d610b2f3e2a6726052924658cb16025 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 27 Feb 2022 21:11:29 +0900 Subject: [PATCH 05/20] remove upstreamed patch --- alexandria-0.7.6-negative-value.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 alexandria-0.7.6-negative-value.patch diff --git a/alexandria-0.7.6-negative-value.patch b/alexandria-0.7.6-negative-value.patch deleted file mode 100644 index 378bf54..0000000 --- a/alexandria-0.7.6-negative-value.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- alexandria-book-collection-manager-0.7.6/lib/alexandria/preferences.rb.negative 2020-11-03 00:35:57.573343839 +0900 -+++ alexandria-book-collection-manager-0.7.6/lib/alexandria/preferences.rb 2020-11-03 00:37:21.996312604 +0900 -@@ -242,7 +242,7 @@ module Alexandria - true - when "false" # bool - false -- when /^[0-9]+$/ # int -+ when /^-?[0-9]+$/ # int - value.to_i - when /^\[(.*)\]$/ # list (assume of type String) - Regexp.last_match[1].split(",") From 592afbdb173b0ac7e83be27812574563caa8b992 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:37:33 +0000 Subject: [PATCH 06/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 05de6f6..beea49c 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -14,7 +14,7 @@ BuildRequires: %{*} \ Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 Summary: Book collection manager License: GPLv2+ @@ -350,6 +350,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.7.9-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Feb 27 2022 Mamoru TASAKA - 0.7.9-1 - 0.7.9 From 7d5f337c862559acbb6c48c87a12c36ff1ca59dd Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Oct 2022 23:31:14 +0900 Subject: [PATCH 07/20] Backport some changes on upstream git for ruby3.2 File.exists? removal --- alexandria.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/alexandria.spec b/alexandria.spec index beea49c..8311102 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,14 +7,14 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define fedorarel 1 +%define fedorarel 2 %define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver} Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist} Summary: Book collection manager License: GPLv2+ @@ -183,6 +183,10 @@ Alexandria is a GNOME application to help you manage your book collection. %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? +sed -i util/rake/gettextgenerate.rb -e 's|unless FileTest.exists.*$||' + # Embed Fedora EVR %{__sed} -i.evr \ -e "s|\(DISPLAY_VERSION = \).*$|\1'%{version}-%{release}'|" \ @@ -294,6 +298,8 @@ export RUBYLIB=$(pwd)/FAKE ping -w3 www.google.co.jp && \ { + # Need taking a look at this + disable_test spec/alexandria/book_providers/loc_provider_spec.rb "works for a book"; true; } \ || \ @@ -350,6 +356,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Mon Oct 17 2022 Mamoru TASAKA - 0.7.9-2 +- Backport some changes on upstream git for ruby3.2 File.exists? removal + * Wed Jul 20 2022 Fedora Release Engineering - 0.7.9-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5cc7e2cad243161a6f47848bde2d03104b895200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:34:33 +0000 Subject: [PATCH 08/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 8311102..8e79209 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -14,7 +14,7 @@ BuildRequires: %{*} \ Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist} +Release: %{rel}%{?dist}.1 Summary: Book collection manager License: GPLv2+ @@ -356,6 +356,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.7.9-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Oct 17 2022 Mamoru TASAKA - 0.7.9-2 - Backport some changes on upstream git for ruby3.2 File.exists? removal From ec1b9cf5e341ed0e1311f61dcb8f488898eeb171 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 13 Mar 2023 10:05:13 +0900 Subject: [PATCH 09/20] rename release macro to make rpmdev-bumprelease work --- alexandria.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alexandria.spec b/alexandria.spec index 8e79209..e5763c8 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,8 +7,8 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define fedorarel 2 -%define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver} +%define baserelease 2 +%define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} From 947f75e453254071c372bdcaf7b4416c275176b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:06:19 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index e5763c8..977b7fc 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 2 +%define baserelease 3 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -356,6 +356,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.7.9-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.7.9-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0349271a51651820a0bd86b10616e0cf0a98cf01 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Dec 2023 10:40:30 +0900 Subject: [PATCH 11/20] Disable z3950x provider test --- alexandria.spec | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/alexandria.spec b/alexandria.spec index 977b7fc..4d09de1 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,14 +7,14 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 3 +%define baserelease 4 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} Name: alexandria Version: %{majorver} -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist} Summary: Book collection manager License: GPLv2+ @@ -163,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 -#%%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 +#%%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 # Part of https://github.com/mvz/alexandria-book-collection-manager/commit/d9116e99242c209129bf09c3c1ad9a4ff6fdcf44 # Needed for ruby3.2 - removes File.exists? @@ -296,6 +296,9 @@ 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 @@ -305,7 +308,6 @@ 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|}"; @@ -356,6 +358,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From b63ee98611721f7432091293afdd22d0212bb6f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Jan 2024 18:01:19 +0900 Subject: [PATCH 12/20] SPDX migration --- alexandria.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/alexandria.spec b/alexandria.spec index 4d09de1..11f61a5 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 4 +%define baserelease 5 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -17,7 +17,10 @@ Version: %{majorver} Release: %{rel}%{?dist} Summary: Book collection manager -License: GPLv2+ +# 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 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 @@ -103,9 +106,7 @@ 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 @@ -332,7 +333,7 @@ done %gconf_schema_remove %{name} %files -f %{name}.lang -%doc COPYING +%license COPYING %doc ChangeLog* %doc INSTALL.md %doc README* @@ -358,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From 88042ee451d762b53bcf8e000a82b1e41cfbcf82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:39:42 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 11f61a5..885e092 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 5 +%define baserelease 6 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From a8933bce155bf1777dde9b47e256693a12a51d4c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:53:05 +0000 Subject: [PATCH 14/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 885e092..35bca24 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 6 +%define baserelease 7 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From d2559b8932dd246f44e2c2982e18bed181cfae6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:49:30 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 35bca24..59971c4 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 7 +%define baserelease 8 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From 9d50be6983a89b439d0c8d19c02a200e5d4cfb2b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 16 Nov 2024 22:23:59 +0900 Subject: [PATCH 16/20] Add missing syck file import (bug 2326632) --- alexandria-0.7.9-yaml-unescape.patch | 5 +++-- alexandria.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/alexandria-0.7.9-yaml-unescape.patch b/alexandria-0.7.9-yaml-unescape.patch index 05aa848..0b2c42a 100644 --- a/alexandria-0.7.9-yaml-unescape.patch +++ b/alexandria-0.7.9-yaml-unescape.patch @@ -33,16 +33,17 @@ old_isbn = book.isbn old_pub_year = book.publishing_year begin -@@ -181,6 +196,8 @@ module Alexandria +@@ -181,6 +196,9 @@ 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 +220,7 @@ module Alexandria +@@ -203,7 +221,7 @@ module Alexandria end - book = Book.from_yaml(text) diff --git a/alexandria.spec b/alexandria.spec index 35bca24..3844316 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 7 +%define baserelease 8 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sat Nov 16 2024 Mamoru TASAKA - 0.7.9-8 +- Add missing syck file import (bug 2326632) + * Mon Jan 22 2024 Fedora Release Engineering - 0.7.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8c763f8b71def5468eef020c02a91c16f8663ed4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 16 Nov 2024 22:25:03 +0900 Subject: [PATCH 17/20] fix release --- alexandria.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alexandria.spec b/alexandria.spec index 46a97a5..424b64d 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 8 +%define baserelease 9 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,7 +359,7 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog -* Sat Nov 16 2024 Mamoru TASAKA - 0.7.9-8 +* 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 From f112a0f65124541428eb7df0da45e778d39d5edd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:50:27 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 424b64d..ab90516 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 9 +%define baserelease 10 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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) From a3695abcb29542c0aea978c25f65fe15f2dad130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:53:09 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index ab90516..4ccac58 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 10 +%define baserelease 11 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ done %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* 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 From b8fc5a94418d91e1ac9b3c3ee4946355a31a87c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:34:36 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- alexandria.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alexandria.spec b/alexandria.spec index 4ccac58..38aa9f4 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -7,7 +7,7 @@ BuildRequires: %{*} \ %undefine minorver %undefine ifpre -%define baserelease 11 +%define baserelease 12 %define rel %{?ifpre:0.}%{baserelease}%{?minorver:.%minorver} @@ -359,6 +359,9 @@ 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