From 0349271a51651820a0bd86b10616e0cf0a98cf01 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 22 Dec 2023 10:40:30 +0900 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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