diff --git a/.gitignore b/.gitignore index 6a37616..375b694 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,3 @@ results_beaker /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..67f1913 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: 29.1 +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 @@ -16,8 +15,8 @@ BuildArch: noarch BuildRequires: python3-setuptools BuildRequires: python3-pytest BuildRequires: python3-devel -%if %{with docs} BuildRequires: python3-docutils +%if 0%{with_docs} BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain %endif @@ -60,9 +59,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 +73,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 @@ -107,7 +110,7 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.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,33 +118,6 @@ 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) diff --git a/sources b/sources index 76ca63f..3fc4f86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-29.2.tar.xz) = a004ab1cb3fe2f9ceb370bb8f307a4afdd972e0715cf81cf7832860721c834bfe2d9b1bc26ae4c3d58ef6506afd176779a166774fbd311b0354444a9f0b8c3f9 +SHA512 (beaker-29.1.tar.xz) = b7f323aab3a66499296a04c8e69bd33e2a17837a80dbf14870437f71fbe496a7a874d8d760e467c680e28f78f83bb31c56862b21ea0366cc638c499734c13e0e