From e79cdbbe88440b04554e3cf6fdfa0486d4e887f1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 01:28:11 +0200 Subject: [PATCH 01/10] Rebuilt for Python 3.13 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 67f1913..47210ea 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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) From a7b8bdaebcddba0ef1ae7e4495bf0d77b21788cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:10:11 +0000 Subject: [PATCH 02/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 47210ea..1031791 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From d28fcc9773df8cfb8fd8d2e4b941a69b4ced6a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:10:43 +0200 Subject: [PATCH 03/10] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- beaker.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/beaker.spec b/beaker.spec index 1031791..a5cc14d 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,9 +3,10 @@ Name: %{upstream_name} Version: 29.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Full-stack software and hardware integration testing system -License: GPLv2+ and BSD +# Automatically converted from old format: GPLv2+ and BSD - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh @@ -118,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From 63818ec5bba1365b03420efa5f50ee585138f2da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:21:58 +0000 Subject: [PATCH 04/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index a5cc14d..ad85070 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Full-stack software and hardware integration testing system # Automatically converted from old format: GPLv2+ and BSD - review is highly recommended. License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From b27531ea06311bd286e9c177601c1e879db06e08 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Mon, 26 May 2025 15:35:24 +0000 Subject: [PATCH 05/10] Beaker 29.2 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 375b694..6a37616 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ 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 ad85070..6b31da8 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 29.1 -Release: 5%{?dist} +Version: 29.2 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system # Automatically converted from old format: GPLv2+ and BSD - review is highly recommended. License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 3fc4f86..76ca63f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-29.1.tar.xz) = b7f323aab3a66499296a04c8e69bd33e2a17837a80dbf14870437f71fbe496a7a874d8d760e467c680e28f78f83bb31c56862b21ea0366cc638c499734c13e0e +SHA512 (beaker-29.2.tar.xz) = a004ab1cb3fe2f9ceb370bb8f307a4afdd972e0715cf81cf7832860721c834bfe2d9b1bc26ae4c3d58ef6506afd176779a166774fbd311b0354444a9f0b8c3f9 From a083f7fd5d79517c8d8638e6a24a5d817b56d54f Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Mon, 26 May 2025 16:11:35 +0000 Subject: [PATCH 06/10] chore(license): drop BSD license reference --- beaker.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/beaker.spec b/beaker.spec index 6b31da8..40af374 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,10 +3,9 @@ Name: %{upstream_name} Version: 29.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system -# Automatically converted from old format: GPLv2+ and BSD - review is highly recommended. -License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD +License: GPL-2.0-or-later URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh @@ -119,6 +118,12 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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) From cb51938a80159614c9e58bb6ca6264b0cfc4b362 Mon Sep 17 00:00:00 2001 From: Martin Hoyer Date: Thu, 29 May 2025 17:27:17 +0200 Subject: [PATCH 07/10] Minor changes needed for EPEL10 --- beaker.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/beaker.spec b/beaker.spec index 40af374..1bd3277 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,5 +1,5 @@ %global upstream_name beaker -%global with_docs 1 +%bcond_without docs Name: %{upstream_name} Version: 29.2 @@ -16,7 +16,7 @@ BuildRequires: python3-setuptools BuildRequires: python3-pytest BuildRequires: python3-devel BuildRequires: python3-docutils -%if 0%{with_docs} +%if %{with docs} BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain %endif @@ -59,7 +59,7 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} -%if !0%{with_docs} +%if %{with docs} rm -rf documentation %endif # The server relies on a great many packages which are intended to be bundled @@ -73,11 +73,6 @@ 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 @@ -110,7 +105,7 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr -%if 0%{with_docs} +%if %{without docs} %{_mandir}/man1/beaker-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz From a1f6ca9794dbf27d903b67e4ad170d39ae8fe696 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 11:00:02 +0200 Subject: [PATCH 08/10] Rebuilt for Python 3.14 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 40af374..78e2955 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-stack software and hardware integration testing system License: GPL-2.0-or-later URL: https://beaker-project.org/ @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From 757797fe8e385de7eb14de165f1ed3c7a3dae6bf Mon Sep 17 00:00:00 2001 From: Martin Hoyer Date: Wed, 23 Jul 2025 12:54:32 +0200 Subject: [PATCH 09/10] Fixing docs build conditionals --- beaker.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/beaker.spec b/beaker.spec index e46c4c5..e074872 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,5 +1,6 @@ %global upstream_name beaker -%bcond_without docs +# No sphinxcontrib-httpdomain rpm on EPEL10 +%bcond docs %[ 0%{?fedora} || 0%{?rhel} < 10 ] Name: %{upstream_name} Version: 29.2 @@ -15,8 +16,8 @@ BuildArch: noarch BuildRequires: python3-setuptools BuildRequires: python3-pytest BuildRequires: python3-devel -BuildRequires: python3-docutils %if %{with docs} +BuildRequires: python3-docutils BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain %endif @@ -59,8 +60,9 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} -%if %{with docs} +%if %{without 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 @@ -105,7 +107,7 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr -%if %{without docs} +%if %{with docs} %{_mandir}/man1/beaker-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz From e5e6753133202f75051a39a9fa0607b413d0fcc1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:37:53 +0000 Subject: [PATCH 10/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index e074872..61bda66 100644 --- a/beaker.spec +++ b/beaker.spec @@ -4,7 +4,7 @@ Name: %{upstream_name} Version: 29.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Full-stack software and hardware integration testing system License: GPL-2.0-or-later URL: https://beaker-project.org/ @@ -115,6 +115,9 @@ 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