diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/plans.fmf b/plans.fmf deleted file mode 100644 index 8f58ed5..0000000 --- a/plans.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Run installmgr tests -discover: - how: fmf -execute: - script: installmgr_tests.sh diff --git a/sword.spec b/sword.spec index 3fa6951..238d952 100644 --- a/sword.spec +++ b/sword.spec @@ -3,9 +3,9 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 36%{?dist} +Release: 22%{?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) +License: GPLv2 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/ # Source0 tarball is generated by sword_gen_free_tarball.sh, which documents # repack rationale and automates tarball fetching and repacking @@ -91,15 +91,7 @@ Perl bindings for The SWORD Library. %autosetup -p1 %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 \ +%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ -DSWORD_BUILD_UTILS="Yes" \ @@ -164,50 +156,6 @@ 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 - -* 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) -- 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 - -* 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 - -* 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 - -* Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 12 2024 Jitka Plesnikova - 1:1.9.0-26 -- Perl 5.40 rebuild - -* Fri Jun 07 2024 Python Maint - 1:1.9.0-25 -- Rebuilt for Python 3.13 - -* Wed Jan 31 2024 Pete Walter - 1:1.9.0-24 -- Rebuild for ICU 74 - -* Sat Jan 27 2024 Fedora Release Engineering - 1:1.9.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Fri Sep 29 2023 Aaron Rainbolt - 1:1.9.0-22 - Replace distutils with setuptools in python setup scripts (rhbz#2220606) - Don't install the INSTALL file as part of the documentation diff --git a/installmgr_test.sh b/tests/installmgr.sh similarity index 100% rename from installmgr_test.sh rename to tests/installmgr.sh diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d8f9dc2 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,10 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + tests: + - installmgr: + dir: . + run: installmgr.sh