From cc86d291b2fd701ba6a12838118b8b52a2679867 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:47:18 +0000 Subject: [PATCH 01/13] Rebuild for ICU 76 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 3f3d52a..df75069 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 +- Rebuild for ICU 76 + * Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 46af13b4317c784f6bc5184d4371c6bc8dc4faf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:07:25 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index df75069..217ae75 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 - Rebuild for ICU 76 From 5b21f8175bfb7be709b0031be528672d0ed855a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:44:59 +0200 Subject: [PATCH 03/13] Rebuilt for Python 3.14 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 217ae75..a45e018 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jun 02 2025 Python Maint - 1:1.9.0-30 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b29427f84d7bfac331dd43b73f61ee7c770698ef Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:27:13 +0200 Subject: [PATCH 04/13] Perl 5.42 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index a45e018..ec70548 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 1:1.9.0-30 - Rebuilt for Python 3.14 From 59dccf301b41f71797d27dd1dbb6bc11327ac6a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:58:24 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index ec70548..0465c6b 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 - Perl 5.42 rebuild From 90aaa0eea0255a3c2ee1ab79483705b436dd4c96 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:02 -0500 Subject: [PATCH 06/13] Set minimum CMake version to 3.5 (rhbz#2381472) --- sword.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0465c6b..75ea453 100644 --- a/sword.spec +++ b/sword.spec @@ -91,7 +91,8 @@ Perl bindings for The SWORD Library. %autosetup -p1 %build -%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ +%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ -DSWORD_BUILD_UTILS="Yes" \ From b731c1ca12f1455c47c37fe7a2a930eeea99b491 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:59 -0500 Subject: [PATCH 07/13] Set non-standard CMake variables back to expected values (rhbz#2381665) --- sword.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sword.spec b/sword.spec index 75ea453..10f2218 100644 --- a/sword.spec +++ b/sword.spec @@ -92,6 +92,13 @@ Perl bindings for The SWORD Library. %build %cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ + %endif -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ From b6db4ed1e7a72637c71ba8c164cab4a1bf7119ea Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:27:34 -0500 Subject: [PATCH 08/13] Migrate InstallMgr test to tmt framework (rhbz#2383081) --- .fmf/version | 1 + tests/installmgr.sh => installmgr_test.sh | 0 plans.fmf | 5 +++++ tests/tests.yml | 10 ---------- 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 .fmf/version rename tests/installmgr.sh => installmgr_test.sh (100%) create mode 100644 plans.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/installmgr.sh b/installmgr_test.sh similarity index 100% rename from tests/installmgr.sh rename to installmgr_test.sh diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..8f58ed5 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,5 @@ +summary: Run installmgr tests +discover: + how: fmf +execute: + script: installmgr_tests.sh diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d8f9dc2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - tests: - - installmgr: - dir: . - run: installmgr.sh From a99ba19821b574552357f651f3f1f7fa078cb6db Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:29:50 -0500 Subject: [PATCH 09/13] Create changelog entry --- sword.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sword.spec b/sword.spec index 10f2218..9c9e262 100644 --- a/sword.spec +++ b/sword.spec @@ -164,6 +164,11 @@ make tests %changelog +* Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 +- Set minimum CMake version to 3.5 (rhbz#2381472) +- Set non-standard CMake variables back to expected values (rhbz#2381665) +- Migrate InstallMgr test to tmt framework (rhbz#2383081) + * Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a65616c2a96dba85cb691267582dd715cec67c63 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:35:46 -0500 Subject: [PATCH 10/13] Set the version number right --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 9c9e262..42d7688 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ From 61def2183b1175002fb599e9e78254e2a50a4d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:58:04 +0200 Subject: [PATCH 11/13] Rebuilt for icu 77.1 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 42d7688..fa19cda 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 +- Rebuilt for icu 77.1 + * Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 - Set minimum CMake version to 3.5 (rhbz#2381472) - Set non-standard CMake variables back to expected values (rhbz#2381665) From 1e2cc791e1efdbf04059695362e3100d8002b5a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:19:25 +0200 Subject: [PATCH 12/13] Rebuilt for Python 3.14.0rc2 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index fa19cda..0fe6dcd 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Aug 15 2025 Python Maint - 1:1.9.0-35 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 - Rebuilt for icu 77.1 From 9cc0caea74086d8dbf97c57d9d89048a1ac3fcc0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:58:40 +0200 Subject: [PATCH 13/13] Rebuilt for Python 3.14.0rc3 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0fe6dcd..3fa6951 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Sep 19 2025 Python Maint - 1:1.9.0-36 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1:1.9.0-35 - Rebuilt for Python 3.14.0rc2 bytecode