diff --git a/.gitignore b/.gitignore index 6a37616..c237a1d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,9 +23,3 @@ results_beaker /beaker-27.3.tar.xz /beaker-27.4.tar.xz /beaker-28.0.tar.xz -/beaker-28.1.tar.xz -/beaker-28.2.tar.xz -/beaker-28.3.tar.xz -/beaker-29.0.tar.xz -/beaker-29.1.tar.xz -/beaker-29.2.tar.xz diff --git a/beaker.spec b/beaker.spec index 61bda66..00a7b0b 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,12 +1,11 @@ %global upstream_name beaker -# No sphinxcontrib-httpdomain rpm on EPEL10 -%bcond docs %[ 0%{?fedora} || 0%{?rhel} < 10 ] +%global with_docs 1 Name: %{upstream_name} -Version: 29.2 -Release: 4%{?dist} +Version: 28.0 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system -License: GPL-2.0-or-later +License: GPLv2+ and BSD URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh @@ -14,10 +13,12 @@ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}. BuildArch: noarch BuildRequires: python3-setuptools -BuildRequires: python3-pytest +BuildRequires: python3-nose +BuildRequires: python3-unittest2 +BuildRequires: python3-mock BuildRequires: python3-devel -%if %{with docs} BuildRequires: python3-docutils +%if 0%{with_docs} BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain %endif @@ -35,7 +36,6 @@ BuildRequires: python3-gssapi BuildRequires: python3-lxml BuildRequires: python3-prettytable BuildRequires: python3-libxml2 -BuildRequires: make Requires: python3-six Requires: python3-setuptools Requires: python3-gssapi @@ -60,9 +60,8 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} -%if %{without docs} +%if !0%{with_docs} rm -rf documentation -sed -i '/SUBDIRS.*:=/s/\s*documentation\s*/ /g' Makefile %endif # The server relies on a great many packages which are intended to be bundled # source, and its documentation greatly inflates the number of BR packages @@ -75,6 +74,11 @@ export BKR_PY3=1 make %install +# RHEL 8 python3-nose removed unversioned executables +%if 0%{?rhel} >= 8 +ln -sf %{_bindir}/nosetests-%{python3_version} %{buildroot}/nosetests-3 +%endif + export BKR_PY3=1 DESTDIR=%{buildroot} make install @@ -86,7 +90,7 @@ rm -rf %{buildroot}%{_mandir}/man8/ %check export BKR_PY3=1 -#make check +make check # Running the checks generates some .pyc files - burn them! find %{buildroot} -name '__pycache__' | xargs rm -rf @@ -97,17 +101,17 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{python3_sitelib}/bkr/__init__.py* %{python3_sitelib}/bkr/common/ %{python3_sitelib}/bkr/log.py* -%{python3_sitelib}/%{name}_common-%{version}-py%{python3_version}.egg-info/ +%{python3_sitelib}/%{name}_common-%{version}-py?.?.egg-info/ %files client %dir %{_sysconfdir}/%{name} %doc Client/client.conf.example %{python3_sitelib}/bkr/client/ -%{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}-nspkg.pth -%{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.egg-info/ +%{python3_sitelib}/%{name}_client-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/%{name}_client-%{version}-py?.?.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr -%if %{with docs} +%if 0%{with_docs} %{_mandir}/man1/beaker-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz @@ -115,114 +119,21 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 29.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 03 2025 Python Maint - 29.2-3 -- Rebuilt for Python 3.14 - -* Mon May 26 2025 Martin Styk - 29.2-2 -- Drop BSD license reference from License tag - The file LabController/src/bkr/labcontroller/tback.py, originally from Django - and licensed under the 3-clause BSD license, was removed. This file is no longer - part of the LabController source tree. - -* Mon May 26 2025 Martin Styk - 29.2-1 -- Release 29.2 (#2368611) - -* Thu Jan 16 2025 Fedora Release Engineering - 29.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 28 2024 Miroslav Suchý - 29.1-4 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 29.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 29.1-2 -- Rebuilt for Python 3.13 - -* Sun Feb 11 2024 Martin Styk - 29.1-1 -- Update to 29.1 (#2263782) - -* Tue Jan 23 2024 Fedora Release Engineering - 29.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 29.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 18 2024 Martin Styk - 29.0-1 -- Update to 29.0 (#2258990) - -* Fri Nov 17 2023 Martin Styk - 28.3-8 -- Backport patch to fix SSL usage on Python 3.12 - -* Wed Jul 26 2023 Martin Styk - 28.3-7 -- Disable tests -- Fix incompatibility with Sphinx 6+ - -* Wed Jul 19 2023 Fedora Release Engineering - 28.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 14 2023 Python Maint - 28.3-5 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 28.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 28.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 28.3-2 -- Rebuilt for Python 3.11 - -* Sat May 21 2022 Martin Styk - 28.3-1 -- Update to 28.3 (#2088909) - -* Wed Jan 19 2022 Fedora Release Engineering - 28.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 28.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 28.2-2 -- Rebuilt for Python 3.10 - -* Wed Feb 17 2021 Martin Styk - 28.2-1 -- Update to 28.2 (#1929311) - -* Thu Jan 28 2021 Martin Styk - 28.1-1 -- Update to 28.1 (#1901445) - -* Tue Jan 26 2021 Fedora Release Engineering - 28.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Tue Aug 25 2020 Martin Styk - 28.0-1 - Update to 28.0 (#1871982) -* Mon Jul 27 2020 Fedora Release Engineering - 27.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Tue May 26 2020 Miro Hrončok - 27.4-2 -- Rebuilt for Python 3.9 - -* Mon Mar 30 2020 Martin Styk - 27.4-1: +* Mon Mar 30 2020 Martin Styk - 27.4-1 - Update to 27.4 (#1818717) -* Wed Mar 18 2020 Martin Styk - 27.3-1: +* Wed Mar 18 2020 Martin Styk - 27.3-1 - Update to 27.3 (#1814828) -* Thu Feb 27 2020 Martin Styk - 27.2-1 +* Fri Feb 28 2020 Martin Styk - 27.2-1 - Update to 27.2 (#1808021) * Wed Jan 29 2020 Martin Styk - 27.1-1 - Update to 27.1 (#1795942) -* Tue Jan 28 2020 Fedora Release Engineering - 27.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 09 2020 Zbigniew Jędrzejewski-Szmek - 27.0-2 -- Remove dependency on unittest2 (#1789200) - * Thu Dec 19 2019 Greg Hellings - 27.0-1 - Upstream release 27.0 - Drop git chasing diff --git a/sources b/sources index 76ca63f..2dd4d17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-29.2.tar.xz) = a004ab1cb3fe2f9ceb370bb8f307a4afdd972e0715cf81cf7832860721c834bfe2d9b1bc26ae4c3d58ef6506afd176779a166774fbd311b0354444a9f0b8c3f9 +SHA512 (beaker-28.0.tar.xz) = b738b4a5b25e19bf9be01ce06b67390d594278ffd22e17d59da0e7818dfdbd02b4955c1dab06cbc14a9abd125749c2463217c6aa2a34a9077ad4fd3dde0c5df9