From 93d520e6cb1f6b05c2951daba1611c398c2e92ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:45:36 +0000 Subject: [PATCH 01/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 3b8cd67..3d36d5a 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -Release: 3%{?dist} +Release: 4%{?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 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 From 16b7d86665dfd25217cc3663c6428c0d16a71ff5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:21:14 +0200 Subject: [PATCH 02/22] Rebuilt for Python 3.12 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 3d36d5a..2171cda 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -Release: 4%{?dist} +Release: 5%{?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 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 From af5ade08a692b33e985ff3370204c8332faf391d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:28:38 +0000 Subject: [PATCH 03/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 2171cda..48d1438 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -Release: 5%{?dist} +Release: 6%{?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 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 From 7339f315f04adbc705fb3bf94002bea6dd495243 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 26 Jul 2023 18:57:23 +0000 Subject: [PATCH 04/22] Patch Sphinx breaking change --- 0000-fix-interpolation-issue-in-sphinx.patch | 27 ++++++++++++++++++++ beaker.spec | 6 +++++ 2 files changed, 33 insertions(+) create mode 100644 0000-fix-interpolation-issue-in-sphinx.patch diff --git a/0000-fix-interpolation-issue-in-sphinx.patch b/0000-fix-interpolation-issue-in-sphinx.patch new file mode 100644 index 0000000..e2cbc6f --- /dev/null +++ b/0000-fix-interpolation-issue-in-sphinx.patch @@ -0,0 +1,27 @@ +From 31be7c0f291ca6a0724936309b8567a9e4fd35c0 Mon Sep 17 00:00:00 2001 +From: Martin Styk +Date: Wed, 26 Jul 2023 20:15:02 +0000 +Subject: [PATCH] Fix interpolation issue + +Sphinx 6 introduced breaking change for extlinks. +extlinks: Sphinx-6.0 will require base URL to contain exactly one \'%s\' and all other \'%\' need to be escaped as \'%%\'.' +--- + documentation/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 24ac13260..5ffff4f1e 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -65,7 +65,7 @@ + 'beakerdev': ('http://beaker-project.org/dev', None), + } + extlinks = { +- 'issue': ('https://bugzilla.redhat.com/show_bug.cgi?id=%s', '#'), ++ 'issue': ('https://bugzilla.redhat.com/show_bug.cgi?id=%s', '#%s'), + } + + if six.PY3: +-- +2.41.0 + diff --git a/beaker.spec b/beaker.spec index 48d1438..ed2d250 100644 --- a/beaker.spec +++ b/beaker.spec @@ -10,6 +10,7 @@ URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz +Patch0: 0000-fix-interpolation-issue-in-sphinx.patch BuildArch: noarch BuildRequires: python3-setuptools @@ -62,6 +63,11 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %if !0%{with_docs} rm -rf documentation %endif + +%if 0%{with_docs} +%patch -p1 0 +%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 # required. Until those are packaged separately, building those subpackages is From 96f6306c4c858bebd3f2de35b21e136e9dac54b0 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 26 Jul 2023 20:48:33 +0000 Subject: [PATCH 05/22] Disable test Tests are not compatible with current Python. The same tests are upstream. Changes should be made there first. --- beaker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index ed2d250..7e0584a 100644 --- a/beaker.spec +++ b/beaker.spec @@ -95,7 +95,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 From 79ed785dd3b8626400c7377f952b135edb8f09fd Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 26 Jul 2023 20:59:17 +0000 Subject: [PATCH 06/22] Rebuild --- beaker.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 7e0584a..7002756 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -124,6 +124,10 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From ed542baa2a63c0cd29b314009a1fd27a263d46fb Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Fri, 17 Nov 2023 13:35:17 +0000 Subject: [PATCH 07/22] Do not use ssl.wrap_socket removed in Python 3.12 Signed-off-by: Martin Styk --- ...l.wrap_socket-removed-in-Python-3.12.patch | 48 +++++++++++++++++++ beaker.spec | 3 ++ 2 files changed, 51 insertions(+) create mode 100644 0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch diff --git a/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch b/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch new file mode 100644 index 0000000..fed472c --- /dev/null +++ b/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch @@ -0,0 +1,48 @@ +From 267f104e1eed0d5181879d557b242332510c488a Mon Sep 17 00:00:00 2001 +From: Michael Hofmann +Date: Fri, 17 Nov 2023 10:06:45 +0100 +Subject: [PATCH] Do not use ssl.wrap_socket removed in Python 3.12 + +Fixes https://github.com/beaker-project/beaker/issues/188 + +Signed-off-by: Michael Hofmann +--- + Common/bkr/common/xmlrpc2.py | 5 ++++- + Common/bkr/common/xmlrpc3.py | 5 ++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/Common/bkr/common/xmlrpc2.py b/Common/bkr/common/xmlrpc2.py +index cb16b8e3a..b4c074c56 100644 +--- a/Common/bkr/common/xmlrpc2.py ++++ b/Common/bkr/common/xmlrpc2.py +@@ -114,7 +114,10 @@ def begin(self): + self.close() + raise socket.error(1001, response.status, response.msg) + +- self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file) ++ context = ssl.create_default_context() ++ if self.cert_file: ++ context.load_cert_chain(self.cert_file, self.key_file) ++ self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host) + + def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): + return TimeoutHTTPConnection.putrequest(self, method, url) +diff --git a/Common/bkr/common/xmlrpc3.py b/Common/bkr/common/xmlrpc3.py +index 869c98e6e..542f4e344 100644 +--- a/Common/bkr/common/xmlrpc3.py ++++ b/Common/bkr/common/xmlrpc3.py +@@ -116,7 +116,10 @@ def begin(self): + self.close() + raise socket.error(1001, response.status, response.msg) + +- self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file) ++ context = ssl.create_default_context() ++ if self.cert_file: ++ context.load_cert_chain(self.cert_file, self.key_file) ++ self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host) + + def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): + return TimeoutHTTPConnection.putrequest(self, method, url) +-- +2.42.1 + diff --git a/beaker.spec b/beaker.spec index 7002756..50fc56c 100644 --- a/beaker.spec +++ b/beaker.spec @@ -11,6 +11,7 @@ URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz Patch0: 0000-fix-interpolation-issue-in-sphinx.patch +Patch1: 0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch BuildArch: noarch BuildRequires: python3-setuptools @@ -68,6 +69,8 @@ rm -rf documentation %patch -p1 0 %endif +%patch -p1 1 + # 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 # required. Until those are packaged separately, building those subpackages is From 335e1c8c4ce10d6d84029e0ec53132fab41e743a Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Fri, 17 Nov 2023 13:45:00 +0000 Subject: [PATCH 08/22] Rebuild with SSL patch backport Signed-off-by: Martin Styk --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 50fc56c..29983f7 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -127,6 +127,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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+ From 3f37d80ff31b3a6fff83d29ddcd0ba04103e58ee Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Thu, 18 Jan 2024 16:26:49 +0000 Subject: [PATCH 09/22] Beaker Release 29 Signed-off-by: Martin Styk --- .gitignore | 1 + 0000-fix-interpolation-issue-in-sphinx.patch | 27 ----------- ...l.wrap_socket-removed-in-Python-3.12.patch | 48 ------------------- beaker.spec | 16 ++----- sources | 2 +- 5 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 0000-fix-interpolation-issue-in-sphinx.patch delete mode 100644 0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch diff --git a/.gitignore b/.gitignore index 870c1a4..19bf257 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ results_beaker /beaker-28.1.tar.xz /beaker-28.2.tar.xz /beaker-28.3.tar.xz +/beaker-29.0.tar.xz diff --git a/0000-fix-interpolation-issue-in-sphinx.patch b/0000-fix-interpolation-issue-in-sphinx.patch deleted file mode 100644 index e2cbc6f..0000000 --- a/0000-fix-interpolation-issue-in-sphinx.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 31be7c0f291ca6a0724936309b8567a9e4fd35c0 Mon Sep 17 00:00:00 2001 -From: Martin Styk -Date: Wed, 26 Jul 2023 20:15:02 +0000 -Subject: [PATCH] Fix interpolation issue - -Sphinx 6 introduced breaking change for extlinks. -extlinks: Sphinx-6.0 will require base URL to contain exactly one \'%s\' and all other \'%\' need to be escaped as \'%%\'.' ---- - documentation/conf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/documentation/conf.py b/documentation/conf.py -index 24ac13260..5ffff4f1e 100644 ---- a/documentation/conf.py -+++ b/documentation/conf.py -@@ -65,7 +65,7 @@ - 'beakerdev': ('http://beaker-project.org/dev', None), - } - extlinks = { -- 'issue': ('https://bugzilla.redhat.com/show_bug.cgi?id=%s', '#'), -+ 'issue': ('https://bugzilla.redhat.com/show_bug.cgi?id=%s', '#%s'), - } - - if six.PY3: --- -2.41.0 - diff --git a/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch b/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch deleted file mode 100644 index fed472c..0000000 --- a/0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 267f104e1eed0d5181879d557b242332510c488a Mon Sep 17 00:00:00 2001 -From: Michael Hofmann -Date: Fri, 17 Nov 2023 10:06:45 +0100 -Subject: [PATCH] Do not use ssl.wrap_socket removed in Python 3.12 - -Fixes https://github.com/beaker-project/beaker/issues/188 - -Signed-off-by: Michael Hofmann ---- - Common/bkr/common/xmlrpc2.py | 5 ++++- - Common/bkr/common/xmlrpc3.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Common/bkr/common/xmlrpc2.py b/Common/bkr/common/xmlrpc2.py -index cb16b8e3a..b4c074c56 100644 ---- a/Common/bkr/common/xmlrpc2.py -+++ b/Common/bkr/common/xmlrpc2.py -@@ -114,7 +114,10 @@ def begin(self): - self.close() - raise socket.error(1001, response.status, response.msg) - -- self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file) -+ context = ssl.create_default_context() -+ if self.cert_file: -+ context.load_cert_chain(self.cert_file, self.key_file) -+ self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host) - - def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): - return TimeoutHTTPConnection.putrequest(self, method, url) -diff --git a/Common/bkr/common/xmlrpc3.py b/Common/bkr/common/xmlrpc3.py -index 869c98e6e..542f4e344 100644 ---- a/Common/bkr/common/xmlrpc3.py -+++ b/Common/bkr/common/xmlrpc3.py -@@ -116,7 +116,10 @@ def begin(self): - self.close() - raise socket.error(1001, response.status, response.msg) - -- self.sock = ssl.wrap_socket(self.sock, keyfile=self.key_file, certfile=self.cert_file) -+ context = ssl.create_default_context() -+ if self.cert_file: -+ context.load_cert_chain(self.cert_file, self.key_file) -+ self.sock = context.wrap_socket(self.sock, server_hostname=self.real_host) - - def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): - return TimeoutHTTPConnection.putrequest(self, method, url) --- -2.42.1 - diff --git a/beaker.spec b/beaker.spec index 29983f7..f7c8358 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,16 +2,14 @@ %global with_docs 1 Name: %{upstream_name} -Version: 28.3 -Release: 8%{?dist} +Version: 29.0 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ # To generate git snapshot, see beaker-snapshot.sh Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz -Patch0: 0000-fix-interpolation-issue-in-sphinx.patch -Patch1: 0001-Do-not-use-ssl.wrap_socket-removed-in-Python-3.12.patch BuildArch: noarch BuildRequires: python3-setuptools @@ -64,13 +62,6 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %if !0%{with_docs} rm -rf documentation %endif - -%if 0%{with_docs} -%patch -p1 0 -%endif - -%patch -p1 1 - # 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 # required. Until those are packaged separately, building those subpackages is @@ -127,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 45784f6..ac676a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-28.3.tar.xz) = 0334f4329ee6ef9d83313ea7a44720234570a69c91fea35ec8f57a26e41c167a50d8f1ffeafcf66d272d0bfb55a2a81c485bb9b9147a15460a0e3c6fa92939c7 +SHA512 (beaker-29.0.tar.xz) = b57f6b1dc1d40138420d5d48c11f8b8803bfc6ac28f96546ac6d805c48d70caa585324547fcc8880fd773416640b7c76786626ab6bed4fdca89702eb98951342 From 9f8bfebfa31e624bee131ca9727b9cd871b941af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:16:36 +0000 Subject: [PATCH 10/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index f7c8358..34a7f56 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.0 -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 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) From 3a9e05ff41817a058883faceb249a07173e9ea7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:13:44 +0000 Subject: [PATCH 11/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 34a7f56..b76c875 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 29.0 -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 +* 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 From c31b604e145046fa1d4a41b741cbf3fb8861718d Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Sun, 11 Feb 2024 20:45:57 +0000 Subject: [PATCH 12/22] Beaker 29.1 Signed-off-by: Martin Styk --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 19bf257..375b694 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ results_beaker /beaker-28.2.tar.xz /beaker-28.3.tar.xz /beaker-29.0.tar.xz +/beaker-29.1.tar.xz diff --git a/beaker.spec b/beaker.spec index b76c875..67f1913 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 29.0 -Release: 3%{?dist} +Version: 29.1 +Release: 1%{?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 +* 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 diff --git a/sources b/sources index ac676a3..3fc4f86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-29.0.tar.xz) = b57f6b1dc1d40138420d5d48c11f8b8803bfc6ac28f96546ac6d805c48d70caa585324547fcc8880fd773416640b7c76786626ab6bed4fdca89702eb98951342 +SHA512 (beaker-29.1.tar.xz) = b7f323aab3a66499296a04c8e69bd33e2a17837a80dbf14870437f71fbe496a7a874d8d760e467c680e28f78f83bb31c56862b21ea0366cc638c499734c13e0e From e79cdbbe88440b04554e3cf6fdfa0486d4e887f1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 01:28:11 +0200 Subject: [PATCH 13/22] 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 14/22] 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 15/22] 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 16/22] 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 17/22] 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 18/22] 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 19/22] 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 20/22] 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 21/22] 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 22/22] 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