From c2ac75a958f186be3daefb573bbf28240a7e47b9 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 6 Mar 2017 10:29:13 -0600 Subject: [PATCH 01/72] Version 24.1, initial import --- .gitignore | 3 + beaker.spec | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 181 insertions(+) create mode 100644 beaker.spec diff --git a/.gitignore b/.gitignore index e69de29..77753e4 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +*.src.rpm +results_beaker +/beaker-24.1.tar.xz diff --git a/beaker.spec b/beaker.spec new file mode 100644 index 0000000..1873ac0 --- /dev/null +++ b/beaker.spec @@ -0,0 +1,177 @@ +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%endif + +# The server, lab controller, and integration test subpackages can be conditionally built. +# Use rpmbuild --without to override. +%global _lc_services beaker-proxy beaker-provision beaker-watchdog beaker-transfer +# systemd? +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +# This will not necessarily match the RPM Version if the real version number is +# not representable in RPM. For example, a release candidate might be 0.15.0rc1 +# but that is not usable for the RPM Version because it sorts higher than +# 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. +%global upstream_version 24.1 +%global upstream_name beaker + +Name: %{upstream_name} +Version: %{upstream_version} +Release: 1%{?dist} +Summary: Full-stack software and hardware integration testing system +Group: Applications/Internet +License: GPLv2+ and BSD +URL: https://beaker-project.org/ + +Source0: https://beaker-project.org/releases/%{upstream_name}-%{upstream_version}.tar.xz + +BuildArch: noarch +BuildRequires: python-setuptools +BuildRequires: python-nose >= 0.10 +BuildRequires: python-unittest2 +BuildRequires: python-mock +BuildRequires: python-setuptools +BuildRequires: python2-devel +BuildRequires: python-docutils >= 0.6 +# These are needed just to build the server manpages +#BuildRequires: python-sqlalchemy +#BuildRequires: TurboGears +#BuildRequires: python-flask +#BuildRequires: python2-decorator +#BuildRequires: python-webassets +#BuildRequires: python-netaddr +#BuildRequires: python-ldap +#BuildRequires: cracklib-python +#BuildRequires: python2-passlib +#BuildRequires: rpm-python +%if 0%{?rhel} == 5 || 0%{?rhel} == 6 +BuildRequires: python-sphinx10 +%else +BuildRequires: python-sphinx >= 1.0 +%endif +BuildRequires: python-sphinxcontrib-httpdomain +BuildRequires: python-prettytable +# setup.py uses pkg-config to find the right installation paths +%if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: pkgconfig(bash-completion) +%endif +%if %{with_systemd} +BuildRequires: pkgconfig(systemd) +%endif +%if 0%{?rhel} >= 6 || 0%{?fedora} +# some client commands use requests, they are unsupported on RHEL5 +BuildRequires: python-requests +%endif + +# As above, these client dependencies are needed in build because of sphinx +BuildRequires: python-krbV +BuildRequires: python-lxml +BuildRequires: libxslt-python + + +%package common +Summary: Common components for Beaker packages +Group: Applications/Internet +Provides: %{upstream_name} = %{version}-%{release} + + +%package client +Summary: Command-line client for interacting with Beaker +Group: Applications/Internet +Requires: python-setuptools +Requires: python2-%{upstream_name}-common = %{version}-%{release} +Requires: python-krbV +Requires: python-lxml +%if 0%{?rhel} >= 6 || 0%{?fedora} +# some client commands use requests, they are unsupported on RHEL5 +Requires: python-requests +%endif +Requires: libxslt-python +%if !(0%{?rhel} >= 6 || 0%{?fedora} >= 14) +Requires: python-simplejson +%endif +Requires: libxml2-python +Requires: python-prettytable +Requires: python-jinja2 +# beaker-wizard was moved from rhts-devel to here in 4.52 +Conflicts: rhts-devel < 4.52 + +%description +Beaker is a full stack software and hardware integration testing system, with +the ability to manage a globally distributed network of test labs. + +%description common +Python modules which are used by other Beaker packages. + +%description client +The bkr client is a command-line tool for interacting with Beaker servers. You +can use it to submit Beaker jobs, fetch results, and perform many other tasks. + +%prep +%setup -q -n %{upstream_name}-%{upstream_version} +# 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 +# unnnecessary +rm -r Server documentation/server-api + +%build +make + +%install +DESTDIR=%{buildroot} make install + +%check +make check + +%files common +%doc README.md +%license COPYING +%dir %{python2_sitelib}/bkr/ +%{python2_sitelib}/bkr/__init__.py* +%{python2_sitelib}/bkr/timeout_xmlrpclib.py* +%{python2_sitelib}/bkr/common/ +%{python2_sitelib}/bkr/log.py* +%{python2_sitelib}/%{upstream_name}_common-%{version}-py2.7.egg-info/ +%{_mandir}/man8/%{upstream_name}-import.8.gz +%exclude %{_mandir}/man8/%{upstream_name}-create-ipxe-image.8.gz +%exclude %{_mandir}/man8/%{upstream_name}-create-kickstart.8.gz +%exclude %{_mandir}/man8/%{upstream_name}-init.8.gz +%exclude %{_mandir}/man8/%{upstream_name}-repo-update.8.gz +%exclude %{_mandir}/man8/%{upstream_name}-usage-reminder.8.gz + +%files client +%dir %{_sysconfdir}/%{upstream_name} +%doc Client/client.conf.example +%{python2_sitelib}/bkr/client/ +%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7-nspkg.pth +%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7.egg-info/ +%{_bindir}/%{upstream_name}-wizard +%{_bindir}/bkr +%{_mandir}/man1/beaker-wizard.1.gz +%{_mandir}/man1/bkr.1.gz +%{_mandir}/man1/bkr-*.1.gz +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%{_datadir}/bash-completion +%else +%{_sysconfdir}/bash_completion.d +%endif + +%changelog +* Mon Mar 06 2017 Greg Hellings - 24.1-1 +- New upstream release 24.1 +- Imported to official builds + +* Wed Mar 01 2017 Greg Hellings - 24.0-2 +- Renamed child packages per review + +* Thu Feb 23 2017 Greg Hellings - 24.0-1 +- Upgraded to upstream 24.0 + +* Wed Dec 21 2016 Greg Hellings - 23.3-1 +- Initial build diff --git a/sources b/sources index e69de29..ad22a50 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (beaker-24.1.tar.xz) = 924f2242313955e324f80dbf8553a5effed9bdefc6e0bc01fc545dd5702883e756556c03ceef06a3a664164a39828ae15695a3f0cc6f4d41b46982a38c4f4712 From d76e33ed0f2a46036d6246cfbb31882825789233 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 6 Mar 2017 13:29:44 -0600 Subject: [PATCH 02/72] Missed dep --- beaker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 1873ac0..bbc3987 100644 --- a/beaker.spec +++ b/beaker.spec @@ -84,7 +84,7 @@ Provides: %{upstream_name} = %{version}-%{release} Summary: Command-line client for interacting with Beaker Group: Applications/Internet Requires: python-setuptools -Requires: python2-%{upstream_name}-common = %{version}-%{release} +Requires: %{upstream_name}-common = %{version}-%{release} Requires: python-krbV Requires: python-lxml %if 0%{?rhel} >= 6 || 0%{?fedora} From 49f033a552e05287b4b9babf7e8e300dde0ec467 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 6 Mar 2017 13:30:42 -0600 Subject: [PATCH 03/72] Bumped release version --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index bbc3987..8e362a4 100644 --- a/beaker.spec +++ b/beaker.spec @@ -22,7 +22,7 @@ Name: %{upstream_name} Version: %{upstream_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -163,6 +163,9 @@ make check %endif %changelog +* Mon Mar 06 2017 Greg Hellings - 24.1-2 +- Fixed broken dependency + * Mon Mar 06 2017 Greg Hellings - 24.1-1 - New upstream release 24.1 - Imported to official builds From c26d0482ab37d0d7714ba889fe2138de5185eb7d Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 6 Apr 2017 12:44:47 -0500 Subject: [PATCH 04/72] Upstream version 24.2 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77753e4..5394586 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.src.rpm results_beaker /beaker-24.1.tar.xz +/beaker-24.2.tar.xz diff --git a/beaker.spec b/beaker.spec index 8e362a4..e7e7ec5 100644 --- a/beaker.spec +++ b/beaker.spec @@ -17,12 +17,12 @@ # not representable in RPM. For example, a release candidate might be 0.15.0rc1 # but that is not usable for the RPM Version because it sorts higher than # 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. -%global upstream_version 24.1 +%global upstream_version 24.2 %global upstream_name beaker Name: %{upstream_name} Version: %{upstream_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -163,6 +163,9 @@ make check %endif %changelog +* Thu Apr 06 2017 Greg Hellings - 24.2-1 +- Upstream release 24.2 + * Mon Mar 06 2017 Greg Hellings - 24.1-2 - Fixed broken dependency diff --git a/sources b/sources index ad22a50..3991db9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.1.tar.xz) = 924f2242313955e324f80dbf8553a5effed9bdefc6e0bc01fc545dd5702883e756556c03ceef06a3a664164a39828ae15695a3f0cc6f4d41b46982a38c4f4712 +SHA512 (beaker-24.2.tar.xz) = 3a7fe7c97f758d48c60e7eb7c6687d7f375341092d2d4c4995474427b0351ac0fc66a93c078332636314b177c1a5d048853322b02c44aafa5a4e795f8cc6c8cc From 8b19aa449686f9017fbd7f9c7ebc7cea7eed1266 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Tue, 30 May 2017 09:18:45 -0500 Subject: [PATCH 05/72] Upstream release 24.3 --- .gitignore | 1 + beaker.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5394586..1780b92 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ results_beaker /beaker-24.1.tar.xz /beaker-24.2.tar.xz +/beaker-24.3.tar.xz diff --git a/beaker.spec b/beaker.spec index e7e7ec5..168dbc4 100644 --- a/beaker.spec +++ b/beaker.spec @@ -17,18 +17,17 @@ # not representable in RPM. For example, a release candidate might be 0.15.0rc1 # but that is not usable for the RPM Version because it sorts higher than # 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. -%global upstream_version 24.2 %global upstream_name beaker Name: %{upstream_name} -Version: %{upstream_version} +Version: 24.3 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD URL: https://beaker-project.org/ -Source0: https://beaker-project.org/releases/%{upstream_name}-%{upstream_version}.tar.xz +Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz BuildArch: noarch BuildRequires: python-setuptools @@ -113,7 +112,7 @@ The bkr client is a command-line tool for interacting with Beaker servers. You can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep -%setup -q -n %{upstream_name}-%{upstream_version} +%setup -q -n %{upstream_name}-%{version} # 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 @@ -163,6 +162,9 @@ make check %endif %changelog +* Tue May 30 2017 Greg Hellings - 24.3-1 +- Upstream release 24.3 + * Thu Apr 06 2017 Greg Hellings - 24.2-1 - Upstream release 24.2 diff --git a/sources b/sources index 3991db9..b3bf719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.2.tar.xz) = 3a7fe7c97f758d48c60e7eb7c6687d7f375341092d2d4c4995474427b0351ac0fc66a93c078332636314b177c1a5d048853322b02c44aafa5a4e795f8cc6c8cc +SHA512 (beaker-24.3.tar.xz) = fd687debcc3b48220fe68f9db75df01fc61c58d1df3c0b1b351ca2c28ed1c45fa4aa4ae95105f33ff79010b87d904bc0fdb0fc1f3a1dae12cdf7ebf3dae0c562 From 04dd70ac3d4672c5ad2a6d9fc18ff68320750a75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 03:51:16 +0000 Subject: [PATCH 06/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 168dbc4..9980054 100644 --- a/beaker.spec +++ b/beaker.spec @@ -21,7 +21,7 @@ Name: %{upstream_name} Version: 24.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -162,6 +162,9 @@ make check %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 24.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue May 30 2017 Greg Hellings - 24.3-1 - Upstream release 24.3 From a9538683ba0ef9dc1dcd7b8d73c756af3a450fbe Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Tue, 3 Oct 2017 10:01:06 -0500 Subject: [PATCH 07/72] Upstream release 24.4 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1780b92..9ea1255 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ results_beaker /beaker-24.1.tar.xz /beaker-24.2.tar.xz /beaker-24.3.tar.xz +/beaker-24.4.tar.xz diff --git a/beaker.spec b/beaker.spec index 9980054..c21fc6e 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,8 +20,8 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 24.3 -Release: 2%{?dist} +Version: 24.4 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -162,6 +162,9 @@ make check %endif %changelog +* Tue Oct 03 2017 Greg Hellings - 24.4-1 +- Upstream release 24.4 + * Wed Jul 26 2017 Fedora Release Engineering - 24.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index b3bf719..faf1484 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.3.tar.xz) = fd687debcc3b48220fe68f9db75df01fc61c58d1df3c0b1b351ca2c28ed1c45fa4aa4ae95105f33ff79010b87d904bc0fdb0fc1f3a1dae12cdf7ebf3dae0c562 +SHA512 (beaker-24.4.tar.xz) = 4c0eef7610ba534908855331021b501cefc671d79876f213053d50ec7ac513f9e3d49206d2133803ba4d476a65a6e66eb8b114f5c0faf2426f6712f5a2d1c8de From 51711cfcf5b390e0221e6ea5064efb4632ca49c9 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 16 Nov 2017 23:00:25 -0600 Subject: [PATCH 08/72] Upstream release 24.5 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9ea1255..366f9be 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ results_beaker /beaker-24.2.tar.xz /beaker-24.3.tar.xz /beaker-24.4.tar.xz +/beaker-24.5.tar.xz diff --git a/beaker.spec b/beaker.spec index c21fc6e..04438c9 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 24.4 +Version: 24.5 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -162,6 +162,9 @@ make check %endif %changelog +* Thu Nov 16 2017 Greg Hellings - 24.5-1 +- Upstream release 24.5 + * Tue Oct 03 2017 Greg Hellings - 24.4-1 - Upstream release 24.4 diff --git a/sources b/sources index faf1484..e2d1e99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.4.tar.xz) = 4c0eef7610ba534908855331021b501cefc671d79876f213053d50ec7ac513f9e3d49206d2133803ba4d476a65a6e66eb8b114f5c0faf2426f6712f5a2d1c8de +SHA512 (beaker-24.5.tar.xz) = f9aa970eb7849099ce0fbe89cc170a25dd086092be5f429ab279e6bc5c4bfa1a0b18957a8f678f614f08cc20d167e1fdacfb8459cf127bbc31c7422d394c53d6 From 19ee76c1902571afb22074b455df35d61cc81005 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 03:41:44 +0000 Subject: [PATCH 09/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 04438c9..c225d51 100644 --- a/beaker.spec +++ b/beaker.spec @@ -21,7 +21,7 @@ Name: %{upstream_name} Version: 24.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -162,6 +162,9 @@ make check %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 24.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Nov 16 2017 Greg Hellings - 24.5-1 - Upstream release 24.5 From 33187bca7b5014c758b7d9de041bfbb231168ba4 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Tue, 13 Mar 2018 11:33:01 -0500 Subject: [PATCH 10/72] New version 25.0 --- .gitignore | 2 ++ beaker.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 366f9be..eb1da25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ *.src.rpm +.*.swp results_beaker /beaker-24.1.tar.xz /beaker-24.2.tar.xz /beaker-24.3.tar.xz /beaker-24.4.tar.xz /beaker-24.5.tar.xz +/beaker-25.0.tar.xz diff --git a/beaker.spec b/beaker.spec index c225d51..f5d5783 100644 --- a/beaker.spec +++ b/beaker.spec @@ -13,15 +13,15 @@ %global with_systemd 0 %endif -# This will not necessarily match the RPM Version if the real version number is -# not representable in RPM. For example, a release candidate might be 0.15.0rc1 -# but that is not usable for the RPM Version because it sorts higher than +# This will not necessarily match the RPM Version if the real version number is +# not representable in RPM. For example, a release candidate might be 0.15.0rc1 +# but that is not usable for the RPM Version because it sorts higher than # 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. %global upstream_name beaker Name: %{upstream_name} -Version: 24.5 -Release: 2%{?dist} +Version: 25.0 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -162,6 +162,9 @@ make check %endif %changelog +* Tue Mar 13 2018 Greg Hellings - 25.0-1 +- Upstream version 25.0 + * Wed Feb 07 2018 Fedora Release Engineering - 24.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index e2d1e99..294628b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.5.tar.xz) = f9aa970eb7849099ce0fbe89cc170a25dd086092be5f429ab279e6bc5c4bfa1a0b18957a8f678f614f08cc20d167e1fdacfb8459cf127bbc31c7422d394c53d6 +SHA512 (beaker-25.0.tar.xz) = 5c069fa8a969255c296aa686d7832870d2923dd9c15ed6f37fa441b62a743399d54468b83bdf85cbe938ecfeacd778c0da18fec4326e502d072fdf2ced7bbacd From 9ddba5d7e94eadcbc0359932f2f72f85b5080978 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 22:45:59 -0500 Subject: [PATCH 11/72] Upstream release 25.2 Fixes BZ1566043 --- .gitignore | 1 + beaker.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eb1da25..d359410 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ results_beaker /beaker-24.4.tar.xz /beaker-24.5.tar.xz /beaker-25.0.tar.xz +/beaker-25.2.tar.xz diff --git a/beaker.spec b/beaker.spec index f5d5783..ac3fb03 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.0 +Version: 25.2 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -162,6 +162,10 @@ make check %endif %changelog +* Mon May 14 2018 Greg Hellings - 25.2-1 +- Upstream version 25.2 +- Fixes BZ1566043 + * Tue Mar 13 2018 Greg Hellings - 25.0-1 - Upstream version 25.0 diff --git a/sources b/sources index 294628b..c82c53c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.0.tar.xz) = 5c069fa8a969255c296aa686d7832870d2923dd9c15ed6f37fa441b62a743399d54468b83bdf85cbe938ecfeacd778c0da18fec4326e502d072fdf2ced7bbacd +SHA512 (beaker-25.2.tar.xz) = 9740e2478bd9997760323a5f3688c8d3ce6fd0995e1aa17d5e4764c7a357dcf3ceaf7f7df633e573c9ff46d5ae396bd7c1bb277cf219f246ac253ced437aabc2 From 92eecd54895685231f350856d72bb8a43bd4aeae Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 23:16:44 -0500 Subject: [PATCH 12/72] Updated Python dependency names --- beaker.spec | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/beaker.spec b/beaker.spec index ac3fb03..b380d8e 100644 --- a/beaker.spec +++ b/beaker.spec @@ -30,13 +30,12 @@ URL: https://beaker-project.org/ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz BuildArch: noarch -BuildRequires: python-setuptools -BuildRequires: python-nose >= 0.10 +BuildRequires: python2-setuptools +BuildRequires: python2-nose >= 0.10 BuildRequires: python-unittest2 BuildRequires: python-mock -BuildRequires: python-setuptools BuildRequires: python2-devel -BuildRequires: python-docutils >= 0.6 +BuildRequires: python2-docutils >= 0.6 # These are needed just to build the server manpages #BuildRequires: python-sqlalchemy #BuildRequires: TurboGears @@ -51,10 +50,10 @@ BuildRequires: python-docutils >= 0.6 %if 0%{?rhel} == 5 || 0%{?rhel} == 6 BuildRequires: python-sphinx10 %else -BuildRequires: python-sphinx >= 1.0 +BuildRequires: python2-sphinx >= 1.0 %endif -BuildRequires: python-sphinxcontrib-httpdomain -BuildRequires: python-prettytable +BuildRequires: python2-sphinxcontrib-httpdomain +BuildRequires: python2-prettytable # setup.py uses pkg-config to find the right installation paths %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: pkgconfig(bash-completion) @@ -64,13 +63,13 @@ BuildRequires: pkgconfig(systemd) %endif %if 0%{?rhel} >= 6 || 0%{?fedora} # some client commands use requests, they are unsupported on RHEL5 -BuildRequires: python-requests +BuildRequires: python2-requests %endif # As above, these client dependencies are needed in build because of sphinx -BuildRequires: python-krbV -BuildRequires: python-lxml -BuildRequires: libxslt-python +BuildRequires: python2-krbV +BuildRequires: python2-lxml +BuildRequires: python2-libxslt %package common @@ -82,21 +81,21 @@ Provides: %{upstream_name} = %{version}-%{release} %package client Summary: Command-line client for interacting with Beaker Group: Applications/Internet -Requires: python-setuptools +Requires: python2-setuptools Requires: %{upstream_name}-common = %{version}-%{release} -Requires: python-krbV -Requires: python-lxml +Requires: python2-krbV +Requires: python2-lxml %if 0%{?rhel} >= 6 || 0%{?fedora} # some client commands use requests, they are unsupported on RHEL5 -Requires: python-requests +Requires: python2-requests %endif Requires: libxslt-python %if !(0%{?rhel} >= 6 || 0%{?fedora} >= 14) Requires: python-simplejson %endif Requires: libxml2-python -Requires: python-prettytable -Requires: python-jinja2 +Requires: python2-prettytable +Requires: python2-jinja2 # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 From 233446d6a9e9575b7d3248659f0798f0c10607af Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 23:21:38 -0500 Subject: [PATCH 13/72] Update Python dep versions --- beaker.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beaker.spec b/beaker.spec index b380d8e..c463c4e 100644 --- a/beaker.spec +++ b/beaker.spec @@ -32,8 +32,8 @@ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}. BuildArch: noarch BuildRequires: python2-setuptools BuildRequires: python2-nose >= 0.10 -BuildRequires: python-unittest2 -BuildRequires: python-mock +BuildRequires: python2-unittest2 +BuildRequires: python2-mock BuildRequires: python2-devel BuildRequires: python2-docutils >= 0.6 # These are needed just to build the server manpages @@ -67,7 +67,7 @@ BuildRequires: python2-requests %endif # As above, these client dependencies are needed in build because of sphinx -BuildRequires: python2-krbV +BuildRequires: python2-krbv BuildRequires: python2-lxml BuildRequires: python2-libxslt @@ -83,13 +83,13 @@ Summary: Command-line client for interacting with Beaker Group: Applications/Internet Requires: python2-setuptools Requires: %{upstream_name}-common = %{version}-%{release} -Requires: python2-krbV +Requires: python2-krbv Requires: python2-lxml %if 0%{?rhel} >= 6 || 0%{?fedora} # some client commands use requests, they are unsupported on RHEL5 Requires: python2-requests %endif -Requires: libxslt-python +Requires: python2-libxslt %if !(0%{?rhel} >= 6 || 0%{?fedora} >= 14) Requires: python-simplejson %endif From 4cd5686a2b729a2b0c14ab96ab5e5906b7d31774 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 25 May 2018 12:00:36 -0500 Subject: [PATCH 14/72] Upstream version 25.4 Fixes BZ#1579575 --- .gitignore | 1 + beaker.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d359410..28164b2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ results_beaker /beaker-24.5.tar.xz /beaker-25.0.tar.xz /beaker-25.2.tar.xz +/beaker-25.4.tar.xz diff --git a/beaker.spec b/beaker.spec index c463c4e..ed3278c 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.2 +Version: 25.4 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -161,6 +161,10 @@ make check %endif %changelog +* Fri May 25 2018 Greg Hellings - 25.4-1 +- Upstream version 25.4 +- Fixes BZ 1579575 + * Mon May 14 2018 Greg Hellings - 25.2-1 - Upstream version 25.2 - Fixes BZ1566043 diff --git a/sources b/sources index c82c53c..b901595 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.2.tar.xz) = 9740e2478bd9997760323a5f3688c8d3ce6fd0995e1aa17d5e4764c7a357dcf3ceaf7f7df633e573c9ff46d5ae396bd7c1bb277cf219f246ac253ced437aabc2 +SHA512 (beaker-25.4.tar.xz) = 68b94e75500362e2bb277828dbac716a0be900a5beb41f9a4e176b6a8e2c5f284d7f33870c3a57998dd9f2b5c4c81e7f83c1744ee327bc1e9ff0a8a7774cdebf From f90270176faed63d36217d3f12fc99bb4c64ef43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:00:00 +0000 Subject: [PATCH 15/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 ed3278c..f869f26 100644 --- a/beaker.spec +++ b/beaker.spec @@ -21,7 +21,7 @@ Name: %{upstream_name} Version: 25.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -161,6 +161,9 @@ make check %endif %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 25.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri May 25 2018 Greg Hellings - 25.4-1 - Upstream version 25.4 - Fixes BZ 1579575 From 988212c29129fdcb3569d6d299f8c1f3efc96f21 Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Fri, 13 Jul 2018 10:51:21 +1000 Subject: [PATCH 16/72] Explicitly invoke python2 instead of python: https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package --- ...tly-invoke-python2-instead-of-python.patch | 232 ++++++++++++++++++ beaker.spec | 9 +- 2 files changed, 240 insertions(+), 1 deletion(-) create mode 100644 0001-explicitly-invoke-python2-instead-of-python.patch diff --git a/0001-explicitly-invoke-python2-instead-of-python.patch b/0001-explicitly-invoke-python2-instead-of-python.patch new file mode 100644 index 0000000..515814a --- /dev/null +++ b/0001-explicitly-invoke-python2-instead-of-python.patch @@ -0,0 +1,232 @@ +From d02e820351e4e63aff1f7baee47631f637448a02 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan +Date: Fri, 6 Jul 2018 10:15:54 +1000 +Subject: [PATCH] explicitly invoke python2 instead of python + +In the latest Fedora releases, packages are forbidden from using +/usr/bin/python (as opposed to /usr/bin/python2) and starting from +Fedora 29 it is no longer available in the build root unless you +explicitly depend on it. + +https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package + +Switch to invoking /usr/bin/python2 everywhere instead. + +Change-Id: I8ffda44c8d1a2aa44d65e847d47338ac634089ff +--- + Client/Makefile | 6 +++--- + Common/Makefile | 6 +++--- + IntegrationTests/Makefile | 6 +++--- + IntegrationTests/run-client.sh | 2 +- + IntegrationTests/run-tests.sh | 2 +- + IntegrationTests/run-wizard.sh | 2 +- + LabController/Makefile | 6 +++--- + Server/Makefile | 6 +++--- + Server/run-server.sh | 2 +- + Server/run-tests.sh | 2 +- + documentation/Makefile | 4 ++-- + 11 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/Client/Makefile b/Client/Makefile +index b4af5d3d2..2e319f27e 100644 +--- a/Client/Makefile ++++ b/Client/Makefile +@@ -7,15 +7,15 @@ + .PHONY: build + build: + env PYTHONPATH=../Common:src:$${PYTHONPATH:+:$$PYTHONPATH} \ +- python setup.py build ++ python2 setup.py build + + .PHONY: install + install: +- python setup.py install -O1 --skip-build --root $(DESTDIR) ++ python2 setup.py install -O1 --skip-build --root $(DESTDIR) + + .PHONY: clean + clean: +- python setup.py clean ++ python2 setup.py clean + rm -rf build + + .PHONY: check +diff --git a/Common/Makefile b/Common/Makefile +index d1f48f4f4..8151772a6 100644 +--- a/Common/Makefile ++++ b/Common/Makefile +@@ -6,14 +6,14 @@ + + .PHONY: build + build: +- python setup.py build ++ python2 setup.py build + # Workaround for https://bitbucket.org/pypa/setuptools/issue/2/ + # See adjacent setup.py for more details + echo bkr > build/namespace_packages.txt + + .PHONY: install + install: build +- python setup.py install -O1 --skip-build --root $(DESTDIR) ++ python2 setup.py install -O1 --skip-build --root $(DESTDIR) + # Workaround for https://bitbucket.org/pypa/setuptools/issue/2/ + # See adjacent setup.py for more details + install -m0644 build/namespace_packages.txt \ +@@ -21,7 +21,7 @@ install: build + + .PHONY: clean + clean: +- python setup.py clean ++ python2 setup.py clean + rm -rf build + + .PHONY: check +diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile +index 9c93a2a1b..6bae190ee 100644 +--- a/IntegrationTests/Makefile ++++ b/IntegrationTests/Makefile +@@ -6,16 +6,16 @@ + + .PHONY: build + build: +- python setup.py build ++ python2 setup.py build + + .PHONY: install + install: build +- python setup.py install -O1 --skip-build \ ++ python2 setup.py install -O1 --skip-build \ + --install-data=/usr/share --root $(DESTDIR) + + .PHONY: clean + clean: +- python setup.py clean ++ python2 setup.py clean + rm -rf build + + .PHONY: check +diff --git a/IntegrationTests/run-client.sh b/IntegrationTests/run-client.sh +index 47f26fbb0..6c035c6ab 100755 +--- a/IntegrationTests/run-client.sh ++++ b/IntegrationTests/run-client.sh +@@ -4,4 +4,4 @@ + # building or installing anything. Used by integration tests. + + exec env PYTHONPATH=$(dirname "$0")/../Common:$(dirname "$0")/../Client/src${PYTHONPATH:+:$PYTHONPATH} \ +- python -u $(dirname "$0")/../Client/src/bkr/client/main.py "$@" ++ python2 -u $(dirname "$0")/../Client/src/bkr/client/main.py "$@" +diff --git a/IntegrationTests/run-tests.sh b/IntegrationTests/run-tests.sh +index ce812ed0f..b3b26ded1 100755 +--- a/IntegrationTests/run-tests.sh ++++ b/IntegrationTests/run-tests.sh +@@ -27,5 +27,5 @@ set -x + env BEAKER_CONFIG_FILE='server-test.cfg' \ + DISCARD_SUBPROCESS_OUTPUT=${DISCARD_SUBPROCESS_OUTPUT:-0} \ + PYTHONPATH=../Common:../Server:../LabController/src:../Client/src:../IntegrationTests/src${PYTHONPATH:+:$PYTHONPATH} \ +- python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ ++ python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ + ${*:--v bkr.inttest} +diff --git a/IntegrationTests/run-wizard.sh b/IntegrationTests/run-wizard.sh +index d793ce1df..e35449b04 100755 +--- a/IntegrationTests/run-wizard.sh ++++ b/IntegrationTests/run-wizard.sh +@@ -2,4 +2,4 @@ + + # see run-client.sh. Used to run the wizard directly from a source checkout. + exec env PYTHONPATH=$(dirname "$0")/../Common:$(dirname "$0")/../Client/src${PYTHONPATH:+:$PYTHONPATH} \ +- python -u $(dirname "$0")/../Client/src/bkr/client/wizard.py "$@" ++ python2 -u $(dirname "$0")/../Client/src/bkr/client/wizard.py "$@" +diff --git a/LabController/Makefile b/LabController/Makefile +index aa229d55f..92663c3e9 100644 +--- a/LabController/Makefile ++++ b/LabController/Makefile +@@ -6,15 +6,15 @@ + + .PHONY: build + build: +- python setup.py build ++ python2 setup.py build + + .PHONY: install + install: build +- python setup.py install -O1 --skip-build --root $(DESTDIR) ++ python2 setup.py install -O1 --skip-build --root $(DESTDIR) + + .PHONY: clean + clean: +- python setup.py clean ++ python2 setup.py clean + rm -rf build + + .PHONY: check +diff --git a/Server/Makefile b/Server/Makefile +index 2af69cb04..25984ea4b 100644 +--- a/Server/Makefile ++++ b/Server/Makefile +@@ -6,16 +6,16 @@ INITSYS := $(shell if [ -f /usr/bin/systemctl ]; then echo "systemd"; else echo + .PHONY: build + build: + env PYTHONPATH=../Common$${PYTHONPATH:+:$$PYTHONPATH} \ +- python setup.py build --install-data=/usr/share/ ++ python2 setup.py build --install-data=/usr/share/ + + .PHONY: install + install: build +- python setup.py install -O1 --skip-build \ ++ python2 setup.py install -O1 --skip-build \ + --install-data=/usr/share --root $(DESTDIR) + + .PHONY: clean + clean: +- python setup.py clean ++ python2 setup.py clean + rm -rf build + + .PHONY: check +diff --git a/Server/run-server.sh b/Server/run-server.sh +index f2634ef96..dff575d10 100755 +--- a/Server/run-server.sh ++++ b/Server/run-server.sh +@@ -1,7 +1,7 @@ + #!/bin/bash + + export PYTHONPATH=../Common:.${PYTHONPATH:+:$PYTHONPATH} +-exec python -c 'import sys, os.path; \ ++exec python2 -c 'import sys, os.path; \ + sys.path[0] = os.path.abspath(sys.path[0]); \ + __requires__ = ["CherryPy < 3.0"]; import pkg_resources; \ + from gunicorn.app.wsgiapp import run; run()' \ +diff --git a/Server/run-tests.sh b/Server/run-tests.sh +index 3a4a8a57e..be6f8c794 100755 +--- a/Server/run-tests.sh ++++ b/Server/run-tests.sh +@@ -3,5 +3,5 @@ + set -x + + env BEAKER_CONFIG_FILE='bkr/server/tests/unit-test.cfg' PYTHONPATH=../Server:../Common${PYTHONPATH:+:$PYTHONPATH} \ +- python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ ++ python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ + ${*:--v --traverse-namespace bkr.server.tests} +diff --git a/documentation/Makefile b/documentation/Makefile +index d55eb2649..60cf80743 100644 +--- a/documentation/Makefile ++++ b/documentation/Makefile +@@ -27,14 +27,14 @@ SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build)) + # Also see: https://bitbucket.org/pypa/setuptools/issue/6/ + + SPHINXREQUIRES = "Sphinx >= 1.0", +-ifeq (0,$(shell python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) ++ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) + SPHINXREQUIRES += "CherryPy < 3.0", + endif + BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr" + + # You can set these variables from the command line. + SPHINXOPTS = +-SPHINXBUILD := python -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ ++SPHINXBUILD := python2 -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ + import bkr; bkr.__path__ = [$(BKR_PATH_INJECTED)]; \ + execfile("$(SPHINXBUILD)")' + PAPER = +-- +2.17.1 + diff --git a/beaker.spec b/beaker.spec index f869f26..9c26863 100644 --- a/beaker.spec +++ b/beaker.spec @@ -21,13 +21,15 @@ Name: %{upstream_name} Version: 25.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD URL: https://beaker-project.org/ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz +# fixed in 25.5: https://git.beaker-project.org/cgit/beaker/commit/?id=d02e820351e4e63aff1f7baee47631f637448a02 +Patch1: 0001-explicitly-invoke-python2-instead-of-python.patch BuildArch: noarch BuildRequires: python2-setuptools @@ -112,6 +114,7 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} +%patch1 -p1 # 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 @@ -161,6 +164,10 @@ make check %endif %changelog +* Fri Jul 13 2018 Dan Callaghan - 25.4-3 +- Explicitly invoke python2 instead of python: + https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package + * Thu Jul 12 2018 Fedora Release Engineering - 25.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 02401ec31b37deaa79ee591a3868ea6b45a3c230 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Wed, 25 Jul 2018 08:47:00 -0500 Subject: [PATCH 17/72] Upstream version 25.5 & labcontroller --- .gitignore | 1 + ...tly-invoke-python2-instead-of-python.patch | 232 ------------------ 0001_dont_build_server.diff | 35 +++ beaker.spec | 48 +++- sources | 2 +- 5 files changed, 81 insertions(+), 237 deletions(-) delete mode 100644 0001-explicitly-invoke-python2-instead-of-python.patch create mode 100644 0001_dont_build_server.diff diff --git a/.gitignore b/.gitignore index 28164b2..241cd91 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ results_beaker /beaker-25.0.tar.xz /beaker-25.2.tar.xz /beaker-25.4.tar.xz +/beaker-25.5.tar.xz diff --git a/0001-explicitly-invoke-python2-instead-of-python.patch b/0001-explicitly-invoke-python2-instead-of-python.patch deleted file mode 100644 index 515814a..0000000 --- a/0001-explicitly-invoke-python2-instead-of-python.patch +++ /dev/null @@ -1,232 +0,0 @@ -From d02e820351e4e63aff1f7baee47631f637448a02 Mon Sep 17 00:00:00 2001 -From: Dan Callaghan -Date: Fri, 6 Jul 2018 10:15:54 +1000 -Subject: [PATCH] explicitly invoke python2 instead of python - -In the latest Fedora releases, packages are forbidden from using -/usr/bin/python (as opposed to /usr/bin/python2) and starting from -Fedora 29 it is no longer available in the build root unless you -explicitly depend on it. - -https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package - -Switch to invoking /usr/bin/python2 everywhere instead. - -Change-Id: I8ffda44c8d1a2aa44d65e847d47338ac634089ff ---- - Client/Makefile | 6 +++--- - Common/Makefile | 6 +++--- - IntegrationTests/Makefile | 6 +++--- - IntegrationTests/run-client.sh | 2 +- - IntegrationTests/run-tests.sh | 2 +- - IntegrationTests/run-wizard.sh | 2 +- - LabController/Makefile | 6 +++--- - Server/Makefile | 6 +++--- - Server/run-server.sh | 2 +- - Server/run-tests.sh | 2 +- - documentation/Makefile | 4 ++-- - 11 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/Client/Makefile b/Client/Makefile -index b4af5d3d2..2e319f27e 100644 ---- a/Client/Makefile -+++ b/Client/Makefile -@@ -7,15 +7,15 @@ - .PHONY: build - build: - env PYTHONPATH=../Common:src:$${PYTHONPATH:+:$$PYTHONPATH} \ -- python setup.py build -+ python2 setup.py build - - .PHONY: install - install: -- python setup.py install -O1 --skip-build --root $(DESTDIR) -+ python2 setup.py install -O1 --skip-build --root $(DESTDIR) - - .PHONY: clean - clean: -- python setup.py clean -+ python2 setup.py clean - rm -rf build - - .PHONY: check -diff --git a/Common/Makefile b/Common/Makefile -index d1f48f4f4..8151772a6 100644 ---- a/Common/Makefile -+++ b/Common/Makefile -@@ -6,14 +6,14 @@ - - .PHONY: build - build: -- python setup.py build -+ python2 setup.py build - # Workaround for https://bitbucket.org/pypa/setuptools/issue/2/ - # See adjacent setup.py for more details - echo bkr > build/namespace_packages.txt - - .PHONY: install - install: build -- python setup.py install -O1 --skip-build --root $(DESTDIR) -+ python2 setup.py install -O1 --skip-build --root $(DESTDIR) - # Workaround for https://bitbucket.org/pypa/setuptools/issue/2/ - # See adjacent setup.py for more details - install -m0644 build/namespace_packages.txt \ -@@ -21,7 +21,7 @@ install: build - - .PHONY: clean - clean: -- python setup.py clean -+ python2 setup.py clean - rm -rf build - - .PHONY: check -diff --git a/IntegrationTests/Makefile b/IntegrationTests/Makefile -index 9c93a2a1b..6bae190ee 100644 ---- a/IntegrationTests/Makefile -+++ b/IntegrationTests/Makefile -@@ -6,16 +6,16 @@ - - .PHONY: build - build: -- python setup.py build -+ python2 setup.py build - - .PHONY: install - install: build -- python setup.py install -O1 --skip-build \ -+ python2 setup.py install -O1 --skip-build \ - --install-data=/usr/share --root $(DESTDIR) - - .PHONY: clean - clean: -- python setup.py clean -+ python2 setup.py clean - rm -rf build - - .PHONY: check -diff --git a/IntegrationTests/run-client.sh b/IntegrationTests/run-client.sh -index 47f26fbb0..6c035c6ab 100755 ---- a/IntegrationTests/run-client.sh -+++ b/IntegrationTests/run-client.sh -@@ -4,4 +4,4 @@ - # building or installing anything. Used by integration tests. - - exec env PYTHONPATH=$(dirname "$0")/../Common:$(dirname "$0")/../Client/src${PYTHONPATH:+:$PYTHONPATH} \ -- python -u $(dirname "$0")/../Client/src/bkr/client/main.py "$@" -+ python2 -u $(dirname "$0")/../Client/src/bkr/client/main.py "$@" -diff --git a/IntegrationTests/run-tests.sh b/IntegrationTests/run-tests.sh -index ce812ed0f..b3b26ded1 100755 ---- a/IntegrationTests/run-tests.sh -+++ b/IntegrationTests/run-tests.sh -@@ -27,5 +27,5 @@ set -x - env BEAKER_CONFIG_FILE='server-test.cfg' \ - DISCARD_SUBPROCESS_OUTPUT=${DISCARD_SUBPROCESS_OUTPUT:-0} \ - PYTHONPATH=../Common:../Server:../LabController/src:../Client/src:../IntegrationTests/src${PYTHONPATH:+:$PYTHONPATH} \ -- python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ -+ python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ - ${*:--v bkr.inttest} -diff --git a/IntegrationTests/run-wizard.sh b/IntegrationTests/run-wizard.sh -index d793ce1df..e35449b04 100755 ---- a/IntegrationTests/run-wizard.sh -+++ b/IntegrationTests/run-wizard.sh -@@ -2,4 +2,4 @@ - - # see run-client.sh. Used to run the wizard directly from a source checkout. - exec env PYTHONPATH=$(dirname "$0")/../Common:$(dirname "$0")/../Client/src${PYTHONPATH:+:$PYTHONPATH} \ -- python -u $(dirname "$0")/../Client/src/bkr/client/wizard.py "$@" -+ python2 -u $(dirname "$0")/../Client/src/bkr/client/wizard.py "$@" -diff --git a/LabController/Makefile b/LabController/Makefile -index aa229d55f..92663c3e9 100644 ---- a/LabController/Makefile -+++ b/LabController/Makefile -@@ -6,15 +6,15 @@ - - .PHONY: build - build: -- python setup.py build -+ python2 setup.py build - - .PHONY: install - install: build -- python setup.py install -O1 --skip-build --root $(DESTDIR) -+ python2 setup.py install -O1 --skip-build --root $(DESTDIR) - - .PHONY: clean - clean: -- python setup.py clean -+ python2 setup.py clean - rm -rf build - - .PHONY: check -diff --git a/Server/Makefile b/Server/Makefile -index 2af69cb04..25984ea4b 100644 ---- a/Server/Makefile -+++ b/Server/Makefile -@@ -6,16 +6,16 @@ INITSYS := $(shell if [ -f /usr/bin/systemctl ]; then echo "systemd"; else echo - .PHONY: build - build: - env PYTHONPATH=../Common$${PYTHONPATH:+:$$PYTHONPATH} \ -- python setup.py build --install-data=/usr/share/ -+ python2 setup.py build --install-data=/usr/share/ - - .PHONY: install - install: build -- python setup.py install -O1 --skip-build \ -+ python2 setup.py install -O1 --skip-build \ - --install-data=/usr/share --root $(DESTDIR) - - .PHONY: clean - clean: -- python setup.py clean -+ python2 setup.py clean - rm -rf build - - .PHONY: check -diff --git a/Server/run-server.sh b/Server/run-server.sh -index f2634ef96..dff575d10 100755 ---- a/Server/run-server.sh -+++ b/Server/run-server.sh -@@ -1,7 +1,7 @@ - #!/bin/bash - - export PYTHONPATH=../Common:.${PYTHONPATH:+:$PYTHONPATH} --exec python -c 'import sys, os.path; \ -+exec python2 -c 'import sys, os.path; \ - sys.path[0] = os.path.abspath(sys.path[0]); \ - __requires__ = ["CherryPy < 3.0"]; import pkg_resources; \ - from gunicorn.app.wsgiapp import run; run()' \ -diff --git a/Server/run-tests.sh b/Server/run-tests.sh -index 3a4a8a57e..be6f8c794 100755 ---- a/Server/run-tests.sh -+++ b/Server/run-tests.sh -@@ -3,5 +3,5 @@ - set -x - - env BEAKER_CONFIG_FILE='bkr/server/tests/unit-test.cfg' PYTHONPATH=../Server:../Common${PYTHONPATH:+:$PYTHONPATH} \ -- python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ -+ python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources; from nose.core import main; main()' \ - ${*:--v --traverse-namespace bkr.server.tests} -diff --git a/documentation/Makefile b/documentation/Makefile -index d55eb2649..60cf80743 100644 ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -27,14 +27,14 @@ SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build)) - # Also see: https://bitbucket.org/pypa/setuptools/issue/6/ - - SPHINXREQUIRES = "Sphinx >= 1.0", --ifeq (0,$(shell python -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) -+ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) - SPHINXREQUIRES += "CherryPy < 3.0", - endif - BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr" - - # You can set these variables from the command line. - SPHINXOPTS = --SPHINXBUILD := python -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ -+SPHINXBUILD := python2 -c '__requires__ = [$(SPHINXREQUIRES)]; import pkg_resources; \ - import bkr; bkr.__path__ = [$(BKR_PATH_INJECTED)]; \ - execfile("$(SPHINXBUILD)")' - PAPER = --- -2.17.1 - diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff new file mode 100644 index 0000000..6ff93cc --- /dev/null +++ b/0001_dont_build_server.diff @@ -0,0 +1,35 @@ +diff --git a/Makefile b/Makefile +index 4297c8d..c463c0b 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ + + DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) + +-SUBDIRS := Common Client documentation Server LabController IntegrationTests ++SUBDIRS := Common Client documentation LabController IntegrationTests + + .PHONY: build + build: +diff --git a/documentation/Makefile b/documentation/Makefile +index 60cf807..33411d0 100644 +--- a/documentation/Makefile ++++ b/documentation/Makefile +@@ -2,7 +2,7 @@ + # + + SHELL = /bin/bash +-export PYTHONPATH=../Common:../Server:../Client/src ++export PYTHONPATH=../Common::../Client/src + SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build)) + + # This Makefile contains some frustrating hacks, centering around the fact that +@@ -30,7 +30,7 @@ SPHINXREQUIRES = "Sphinx >= 1.0", + ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) + SPHINXREQUIRES += "CherryPy < 3.0", + endif +-BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr" ++BKR_PATH_INJECTED = "../Common/bkr", "../Client/src/bkr" + + # You can set these variables from the command line. + SPHINXOPTS = diff --git a/beaker.spec b/beaker.spec index 9c26863..4a86a86 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,16 +20,16 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.4 -Release: 3%{?dist} +Version: 25.5 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD URL: https://beaker-project.org/ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz -# fixed in 25.5: https://git.beaker-project.org/cgit/beaker/commit/?id=d02e820351e4e63aff1f7baee47631f637448a02 -Patch1: 0001-explicitly-invoke-python2-instead-of-python.patch +# Explicitly remove building server from the Makefiles +Patch1: 0001_dont_build_server.diff BuildArch: noarch BuildRequires: python2-setuptools @@ -38,6 +38,8 @@ BuildRequires: python2-unittest2 BuildRequires: python2-mock BuildRequires: python2-devel BuildRequires: python2-docutils >= 0.6 +BuildRequires: python2-gevent +BuildRequires: python2-werkzeug # These are needed just to build the server manpages #BuildRequires: python-sqlalchemy #BuildRequires: TurboGears @@ -79,6 +81,16 @@ Summary: Common components for Beaker packages Group: Applications/Internet Provides: %{upstream_name} = %{version}-%{release} +%package labcontroller +Summary: Beaker labcontroller service files +Group: Applications/Internet +Requires: %{upstream_name}-common = %{version}-%{release} +Requires: python2-gevent +Requires: python2-werkzeug + +%description labcontroller +Files to run the Beaker labcontroller functionality + %package client Summary: Command-line client for interacting with Beaker @@ -98,6 +110,8 @@ Requires: python-simplejson Requires: libxml2-python Requires: python2-prettytable Requires: python2-jinja2 +Requires: python2-gevent +Requires: python2-werkzeug # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -127,6 +141,11 @@ make %install DESTDIR=%{buildroot} make install +rm -rf %{buildroot}%{_datadir}/bkr/lab-controller/*.rpm +rm -rf %{buildroot}%{_datadir}/beaker-integration-tests/ +rm -rf %{buildroot}%{python2_sitelib}/bkr/inttest +rm -rf %{buildroot}%{python2_sitelib}/beaker_integration_tests* + %check make check @@ -146,6 +165,21 @@ make check %exclude %{_mandir}/man8/%{upstream_name}-repo-update.8.gz %exclude %{_mandir}/man8/%{upstream_name}-usage-reminder.8.gz +%files labcontroller +%{_bindir}/beaker-* +%{_sysconfdir}/beaker/labcontroller.conf +%{_sysconfdir}/cron.hourly/beaker_expire_distros +%{_sysconfdir}/httpd/conf.d/beaker-lab-controller.conf +%{_sysconfdir}/rsyslog.d/beaker-lab-controller.conf +%{_sysconfdir}/sudoers.d/beaker_proxy_clear_netboot +%{python2_sitelib}/bkr/labcontroller/ +%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?.egg-info +%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?-nspkg.pth +%{_unitdir}/beaker-*.service +%{_tmpfilesdir}/beaker-lab-controller.conf +%{_datadir}/bkr/lab-controller/ +%{_sharedstatedir}/beaker/ + %files client %dir %{_sysconfdir}/%{upstream_name} %doc Client/client.conf.example @@ -164,6 +198,12 @@ make check %endif %changelog +* Wed Jul 25 2018 Greg Hellings - 25.5-1 +- Upstream version 25.5 +- Fixes BZ1607380 +- Added deps for gevent and werkzeug +- Added labcontroller subpackage + * Fri Jul 13 2018 Dan Callaghan - 25.4-3 - Explicitly invoke python2 instead of python: https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package diff --git a/sources b/sources index b901595..73062d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.4.tar.xz) = 68b94e75500362e2bb277828dbac716a0be900a5beb41f9a4e176b6a8e2c5f284d7f33870c3a57998dd9f2b5c4c81e7f83c1744ee327bc1e9ff0a8a7774cdebf +SHA512 (beaker-25.5.tar.xz) = 7972dfd51c467492df0358a3886f61ca72fdb2bdfe67ec2de3aea47305ebfbcbdf5b8c35da8d43998dfa78e4aa170bd413498d26ac4360b488404a088ba2a808 From 49064d11a30cf1a0fb3a6eb818c22cd4eb4e02be Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 3 Aug 2018 09:25:17 -0500 Subject: [PATCH 18/72] Updates to spec file, removing lab-controller --- 0001_dont_build_server.diff | 2 +- beaker.spec | 134 +++++++----------------------------- 2 files changed, 27 insertions(+), 109 deletions(-) diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff index 6ff93cc..db51732 100644 --- a/0001_dont_build_server.diff +++ b/0001_dont_build_server.diff @@ -7,7 +7,7 @@ index 4297c8d..c463c0b 100644 DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) -SUBDIRS := Common Client documentation Server LabController IntegrationTests -+SUBDIRS := Common Client documentation LabController IntegrationTests ++SUBDIRS := Common Client documentation .PHONY: build build: diff --git a/beaker.spec b/beaker.spec index 4a86a86..1c811da 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,18 +1,3 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%endif - -# The server, lab controller, and integration test subpackages can be conditionally built. -# Use rpmbuild --without to override. -%global _lc_services beaker-proxy beaker-provision beaker-watchdog beaker-transfer -# systemd? -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%global with_systemd 1 -%else -%global with_systemd 0 -%endif - # This will not necessarily match the RPM Version if the real version number is # not representable in RPM. For example, a release candidate might be 0.15.0rc1 # but that is not usable for the RPM Version because it sorts higher than @@ -21,7 +6,7 @@ Name: %{upstream_name} Version: 25.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -33,85 +18,37 @@ Patch1: 0001_dont_build_server.diff BuildArch: noarch BuildRequires: python2-setuptools -BuildRequires: python2-nose >= 0.10 +BuildRequires: python2-nose BuildRequires: python2-unittest2 BuildRequires: python2-mock BuildRequires: python2-devel -BuildRequires: python2-docutils >= 0.6 -BuildRequires: python2-gevent -BuildRequires: python2-werkzeug -# These are needed just to build the server manpages -#BuildRequires: python-sqlalchemy -#BuildRequires: TurboGears -#BuildRequires: python-flask -#BuildRequires: python2-decorator -#BuildRequires: python-webassets -#BuildRequires: python-netaddr -#BuildRequires: python-ldap -#BuildRequires: cracklib-python -#BuildRequires: python2-passlib -#BuildRequires: rpm-python -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 -BuildRequires: python-sphinx10 -%else -BuildRequires: python2-sphinx >= 1.0 -%endif +BuildRequires: python2-docutils +BuildRequires: python2-sphinx BuildRequires: python2-sphinxcontrib-httpdomain -BuildRequires: python2-prettytable -# setup.py uses pkg-config to find the right installation paths -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: pkgconfig(bash-completion) -%endif -%if %{with_systemd} -BuildRequires: pkgconfig(systemd) -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} -# some client commands use requests, they are unsupported on RHEL5 -BuildRequires: python2-requests -%endif - -# As above, these client dependencies are needed in build because of sphinx -BuildRequires: python2-krbv -BuildRequires: python2-lxml -BuildRequires: python2-libxslt - %package common Summary: Common components for Beaker packages Group: Applications/Internet -Provides: %{upstream_name} = %{version}-%{release} - -%package labcontroller -Summary: Beaker labcontroller service files -Group: Applications/Internet -Requires: %{upstream_name}-common = %{version}-%{release} -Requires: python2-gevent -Requires: python2-werkzeug - -%description labcontroller -Files to run the Beaker labcontroller functionality - +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < 0.17.0-1 %package client Summary: Command-line client for interacting with Beaker Group: Applications/Internet +Requires: %{name}-common = %{version}-%{release} +BuildRequires: pkgconfig(bash-completion) +BuildRequires: python2-krbv +BuildRequires: python2-lxml +BuildRequires: python2-libxslt +BuildRequires: python2-prettytable Requires: python2-setuptools -Requires: %{upstream_name}-common = %{version}-%{release} Requires: python2-krbv Requires: python2-lxml -%if 0%{?rhel} >= 6 || 0%{?fedora} -# some client commands use requests, they are unsupported on RHEL5 Requires: python2-requests -%endif Requires: python2-libxslt -%if !(0%{?rhel} >= 6 || 0%{?fedora} >= 14) -Requires: python-simplejson -%endif -Requires: libxml2-python +Requires: python2-libxml2 Requires: python2-prettytable Requires: python2-jinja2 -Requires: python2-gevent -Requires: python2-werkzeug # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -133,7 +70,7 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. # source, and its documentation greatly inflates the number of BR packages # required. Until those are packaged separately, building those subpackages is # unnnecessary -rm -r Server documentation/server-api +rm -r Server documentation/server-api IntegrationTests LabController %build make @@ -141,10 +78,11 @@ make %install DESTDIR=%{buildroot} make install -rm -rf %{buildroot}%{_datadir}/bkr/lab-controller/*.rpm rm -rf %{buildroot}%{_datadir}/beaker-integration-tests/ rm -rf %{buildroot}%{python2_sitelib}/bkr/inttest rm -rf %{buildroot}%{python2_sitelib}/beaker_integration_tests* +# These are for lab-controller stuff, which depends on server +rm -rf %{buildroot}%{_mandir}/man8/ %check make check @@ -157,47 +95,27 @@ make check %{python2_sitelib}/bkr/timeout_xmlrpclib.py* %{python2_sitelib}/bkr/common/ %{python2_sitelib}/bkr/log.py* -%{python2_sitelib}/%{upstream_name}_common-%{version}-py2.7.egg-info/ -%{_mandir}/man8/%{upstream_name}-import.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-create-ipxe-image.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-create-kickstart.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-init.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-repo-update.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-usage-reminder.8.gz - -%files labcontroller -%{_bindir}/beaker-* -%{_sysconfdir}/beaker/labcontroller.conf -%{_sysconfdir}/cron.hourly/beaker_expire_distros -%{_sysconfdir}/httpd/conf.d/beaker-lab-controller.conf -%{_sysconfdir}/rsyslog.d/beaker-lab-controller.conf -%{_sysconfdir}/sudoers.d/beaker_proxy_clear_netboot -%{python2_sitelib}/bkr/labcontroller/ -%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?.egg-info -%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?-nspkg.pth -%{_unitdir}/beaker-*.service -%{_tmpfilesdir}/beaker-lab-controller.conf -%{_datadir}/bkr/lab-controller/ -%{_sharedstatedir}/beaker/ +%{python2_sitelib}/%{name}_common-%{version}-py2.7.egg-info/ %files client -%dir %{_sysconfdir}/%{upstream_name} +%dir %{_sysconfdir}/%{name} %doc Client/client.conf.example %{python2_sitelib}/bkr/client/ -%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7-nspkg.pth -%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7.egg-info/ -%{_bindir}/%{upstream_name}-wizard +%{python2_sitelib}/%{name}_client-%{version}-py2.7-nspkg.pth +%{python2_sitelib}/%{name}_client-%{version}-py2.7.egg-info/ +%{_bindir}/%{name}-wizard %{_bindir}/bkr %{_mandir}/man1/beaker-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %{_datadir}/bash-completion -%else -%{_sysconfdir}/bash_completion.d -%endif %changelog +* Fri Aug 03 2018 Greg Hellings - 25.5-2 +- Remove lab-controller, which depends on server +- Remove integration tests, which are designed for server use +- Shuffle BR/Requires to bring into line with upstream + * Wed Jul 25 2018 Greg Hellings - 25.5-1 - Upstream version 25.5 - Fixes BZ1607380 From f946f8f3bb3cc18d65339d35ce7ac21c094fcd5d Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Wed, 5 Sep 2018 22:07:09 -0500 Subject: [PATCH 19/72] Upstream version 25.6 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 241cd91..eae8a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ results_beaker /beaker-25.2.tar.xz /beaker-25.4.tar.xz /beaker-25.5.tar.xz +/beaker-25.6.tar.xz diff --git a/beaker.spec b/beaker.spec index 1c811da..7c5f409 100644 --- a/beaker.spec +++ b/beaker.spec @@ -5,8 +5,8 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.5 -Release: 2%{?dist} +Version: 25.6 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -111,6 +111,9 @@ make check %{_datadir}/bash-completion %changelog +* Wed Sep 05 2018 Greg Hellings - 25.6-1 +- New upstream 25.6 + * Fri Aug 03 2018 Greg Hellings - 25.5-2 - Remove lab-controller, which depends on server - Remove integration tests, which are designed for server use diff --git a/sources b/sources index 73062d9..7b1f513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.5.tar.xz) = 7972dfd51c467492df0358a3886f61ca72fdb2bdfe67ec2de3aea47305ebfbcbdf5b8c35da8d43998dfa78e4aa170bd413498d26ac4360b488404a088ba2a808 +SHA512 (beaker-25.6.tar.xz) = f0654f62f8a1dadcbf84e09086d488bf4bcb0b6807ae6083bac1c96d5ee88dca428066b41ddebe045e0e779dc694f0f23e7bc613c4aa2df33210ff7352bcd236 From c2fb874a2b0cd30a5affb0e8c094af664942f939 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 2 Nov 2018 12:52:42 -0500 Subject: [PATCH 20/72] Upstream 26.0 BZ#1636072 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eae8a9f..2bca05f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ results_beaker /beaker-25.4.tar.xz /beaker-25.5.tar.xz /beaker-25.6.tar.xz +/beaker-26.0.tar.xz diff --git a/beaker.spec b/beaker.spec index 7c5f409..ab0695e 100644 --- a/beaker.spec +++ b/beaker.spec @@ -5,7 +5,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.6 +Version: 26.0 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -111,6 +111,9 @@ make check %{_datadir}/bash-completion %changelog +* Fri Nov 02 2018 Greg Hellings - 26.0-1 +- New upstream 26.0 + * Wed Sep 05 2018 Greg Hellings - 25.6-1 - New upstream 25.6 diff --git a/sources b/sources index 7b1f513..739d95c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.6.tar.xz) = f0654f62f8a1dadcbf84e09086d488bf4bcb0b6807ae6083bac1c96d5ee88dca428066b41ddebe045e0e779dc694f0f23e7bc613c4aa2df33210ff7352bcd236 +SHA512 (beaker-26.0.tar.xz) = c880a88a1d383e643cf5b6dda4b757e74c886e44ea2adad38abffda2bb8988b57e5bbe1d1b38fa347ea1ddfa1aba85f355ab8f609d7ca439edad80bb9f5b5847 From ccd21ed21f8a94aa5875c459723460023f31d82d Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 24 Jan 2019 22:58:24 -0600 Subject: [PATCH 21/72] New upstream 26.3 BZ1667496 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2bca05f..8556378 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ results_beaker /beaker-25.5.tar.xz /beaker-25.6.tar.xz /beaker-26.0.tar.xz +/beaker-26.3.tar.xz diff --git a/beaker.spec b/beaker.spec index ab0695e..4ecddf4 100644 --- a/beaker.spec +++ b/beaker.spec @@ -5,7 +5,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 26.0 +Version: 26.3 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -111,6 +111,9 @@ make check %{_datadir}/bash-completion %changelog +* Thu Jan 24 2019 Greg Hellings - 26.3-1 +- New upstream 26.3 + * Fri Nov 02 2018 Greg Hellings - 26.0-1 - New upstream 26.0 diff --git a/sources b/sources index 739d95c..c534384 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.0.tar.xz) = c880a88a1d383e643cf5b6dda4b757e74c886e44ea2adad38abffda2bb8988b57e5bbe1d1b38fa347ea1ddfa1aba85f355ab8f609d7ca439edad80bb9f5b5847 +SHA512 (beaker-26.3.tar.xz) = e8898cffc8a0ed5b1a94d3ec190fcf406fc1cbc4eec43601cbf1aaf97aacb496140545349ae7dc946bf0aaf4f486226bcac996b0d96637bd1336ea3183ea4335 From d64f786f33344f785f8a96ff9ed5ebbbb4723b57 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:39 +0100 Subject: [PATCH 22/72] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- beaker.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/beaker.spec b/beaker.spec index 4ecddf4..4372e29 100644 --- a/beaker.spec +++ b/beaker.spec @@ -8,7 +8,6 @@ Name: %{upstream_name} Version: 26.3 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system -Group: Applications/Internet License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -28,13 +27,11 @@ BuildRequires: python2-sphinxcontrib-httpdomain %package common Summary: Common components for Beaker packages -Group: Applications/Internet Provides: %{name} = %{version}-%{release} Obsoletes: %{name} < 0.17.0-1 %package client Summary: Command-line client for interacting with Beaker -Group: Applications/Internet Requires: %{name}-common = %{version}-%{release} BuildRequires: pkgconfig(bash-completion) BuildRequires: python2-krbv From 0122a4ae9617dc7690f74ed1cbd6b6e2d69f1707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 14:29:36 +0000 Subject: [PATCH 23/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 4372e29..ee96c3a 100644 --- a/beaker.spec +++ b/beaker.spec @@ -6,7 +6,7 @@ Name: %{upstream_name} Version: 26.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -108,6 +108,9 @@ make check %{_datadir}/bash-completion %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 26.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 24 2019 Greg Hellings - 26.3-1 - New upstream 26.3 From 6d61f11230020281bc47f6835acb2c6c7e35b982 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:08:23 +0000 Subject: [PATCH 24/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 ee96c3a..a274e72 100644 --- a/beaker.spec +++ b/beaker.spec @@ -6,7 +6,7 @@ Name: %{upstream_name} Version: 26.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -108,6 +108,9 @@ make check %{_datadir}/bash-completion %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 26.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 26.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6fdaade95d6977796eeb65579cb6aba3d548d020 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 5 Aug 2019 23:11:35 -0500 Subject: [PATCH 25/72] Upstream version 26.5 --- .gitignore | 1 + 0002_dont_build_documentation.diff | 13 ++++++++++++ 0003_nosetests_python2.diff | 20 +++++++++++++++++++ beaker.spec | 32 +++++++++++++++++++++--------- sources | 2 +- 5 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 0002_dont_build_documentation.diff create mode 100644 0003_nosetests_python2.diff diff --git a/.gitignore b/.gitignore index 8556378..d4b99b1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ results_beaker /beaker-25.6.tar.xz /beaker-26.0.tar.xz /beaker-26.3.tar.xz +/beaker-26.5.tar.xz diff --git a/0002_dont_build_documentation.diff b/0002_dont_build_documentation.diff new file mode 100644 index 0000000..bada13b --- /dev/null +++ b/0002_dont_build_documentation.diff @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index c1d172e..48726d0 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ + + DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) + +-SUBDIRS := Common Client documentation ++SUBDIRS := Common Client + + .PHONY: build + build: diff --git a/0003_nosetests_python2.diff b/0003_nosetests_python2.diff new file mode 100644 index 0000000..0887538 --- /dev/null +++ b/0003_nosetests_python2.diff @@ -0,0 +1,20 @@ +diff --git a/Client/run-tests.sh b/Client/run-tests.sh +index b381ef4..2e55e65 100755 +--- a/Client/run-tests.sh ++++ b/Client/run-tests.sh +@@ -3,4 +3,4 @@ + set -x + + env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \ +- nosetests ${*:--v --traverse-namespace bkr.client.tests} ++ nosetests-2 ${*:--v --traverse-namespace bkr.client.tests} +diff --git a/Common/run-tests.sh b/Common/run-tests.sh +index 2c93d4b..e2d7c39 100755 +--- a/Common/run-tests.sh ++++ b/Common/run-tests.sh +@@ -3,4 +3,4 @@ + set -x + + env PYTHONPATH=.${PYTHONPATH:+:$PYTHONPATH} \ +- nosetests ${*:--v bkr} ++ nosetests-2 ${*:--v bkr} diff --git a/beaker.spec b/beaker.spec index ee96c3a..ae90886 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,12 +1,9 @@ -# This will not necessarily match the RPM Version if the real version number is -# not representable in RPM. For example, a release candidate might be 0.15.0rc1 -# but that is not usable for the RPM Version because it sorts higher than -# 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. %global upstream_name beaker +%global with_docs 0 Name: %{upstream_name} -Version: 26.3 -Release: 2%{?dist} +Version: 26.5 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -14,6 +11,8 @@ URL: https://beaker-project.org/ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz # Explicitly remove building server from the Makefiles Patch1: 0001_dont_build_server.diff +Patch2: 0002_dont_build_documentation.diff +Patch3: 0003_nosetests_python2.diff BuildArch: noarch BuildRequires: python2-setuptools @@ -22,8 +21,10 @@ BuildRequires: python2-unittest2 BuildRequires: python2-mock BuildRequires: python2-devel BuildRequires: python2-docutils -BuildRequires: python2-sphinx -BuildRequires: python2-sphinxcontrib-httpdomain +%if 0%{with_docs} +BuildRequires: python3-sphinx +BuildRequires: python3-sphinxcontrib-httpdomain +%endif %package common Summary: Common components for Beaker packages @@ -63,11 +64,16 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} %patch1 -p1 +%if !0%{with_docs} +%patch2 -p1 +rm -rf documentation +%endif +%patch3 -p1 # 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 # unnnecessary -rm -r Server documentation/server-api IntegrationTests LabController +rm -r Server IntegrationTests LabController #documentation/server-api %build make @@ -102,12 +108,20 @@ make check %{python2_sitelib}/%{name}_client-%{version}-py2.7.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr +%if 0%{with_docs} %{_mandir}/man1/beaker-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz +%endif %{_datadir}/bash-completion %changelog +* Tue Jul 16 2019 Greg Hellings - 26.5-1 +- Upstream version 26.5 + +* Sun Mar 31 2019 Greg Hellings - 26.4-1 +- Upstream version 26.4 + * Thu Jan 31 2019 Fedora Release Engineering - 26.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index c534384..c8341cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.3.tar.xz) = e8898cffc8a0ed5b1a94d3ec190fcf406fc1cbc4eec43601cbf1aaf97aacb496140545349ae7dc946bf0aaf4f486226bcac996b0d96637bd1336ea3183ea4335 +SHA512 (beaker-26.5.tar.xz) = a57e24837888c32a317f74e7a5eef2d874940c60322c655005eb80f8a721e7874b91eb43c503e9257c5e1ee9e20b12e63986889a10dfbbb57e8aefc936025afb From eba406ffe046f082791771397dc67a69fa7ec8e9 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 26 Sep 2019 11:50:59 -0500 Subject: [PATCH 26/72] Update to git instead of releases Move to Python 3 --- .gitignore | 2 + 0001_dont_build_server.diff | 35 ------------ 0002_dont_build_documentation.diff | 13 ----- 0003_nosetests_python2.diff | 20 ------- beaker-snapshot.sh | 14 +++++ beaker.spec | 92 +++++++++++++++++------------- sources | 2 +- 7 files changed, 69 insertions(+), 109 deletions(-) delete mode 100644 0001_dont_build_server.diff delete mode 100644 0002_dont_build_documentation.diff delete mode 100644 0003_nosetests_python2.diff create mode 100755 beaker-snapshot.sh diff --git a/.gitignore b/.gitignore index d4b99b1..5a1f64d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.src.rpm .*.swp +beaker-checkout results_beaker /beaker-24.1.tar.xz /beaker-24.2.tar.xz @@ -14,3 +15,4 @@ results_beaker /beaker-26.0.tar.xz /beaker-26.3.tar.xz /beaker-26.5.tar.xz +/beaker-26.5-49-g97e14daec.tar.gz diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff deleted file mode 100644 index db51732..0000000 --- a/0001_dont_build_server.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4297c8d..c463c0b 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ - - DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) - --SUBDIRS := Common Client documentation Server LabController IntegrationTests -+SUBDIRS := Common Client documentation - - .PHONY: build - build: -diff --git a/documentation/Makefile b/documentation/Makefile -index 60cf807..33411d0 100644 ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -2,7 +2,7 @@ - # - - SHELL = /bin/bash --export PYTHONPATH=../Common:../Server:../Client/src -+export PYTHONPATH=../Common::../Client/src - SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build)) - - # This Makefile contains some frustrating hacks, centering around the fact that -@@ -30,7 +30,7 @@ SPHINXREQUIRES = "Sphinx >= 1.0", - ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) - SPHINXREQUIRES += "CherryPy < 3.0", - endif --BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr" -+BKR_PATH_INJECTED = "../Common/bkr", "../Client/src/bkr" - - # You can set these variables from the command line. - SPHINXOPTS = diff --git a/0002_dont_build_documentation.diff b/0002_dont_build_documentation.diff deleted file mode 100644 index bada13b..0000000 --- a/0002_dont_build_documentation.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index c1d172e..48726d0 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ - - DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) - --SUBDIRS := Common Client documentation -+SUBDIRS := Common Client - - .PHONY: build - build: diff --git a/0003_nosetests_python2.diff b/0003_nosetests_python2.diff deleted file mode 100644 index 0887538..0000000 --- a/0003_nosetests_python2.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Client/run-tests.sh b/Client/run-tests.sh -index b381ef4..2e55e65 100755 ---- a/Client/run-tests.sh -+++ b/Client/run-tests.sh -@@ -3,4 +3,4 @@ - set -x - - env PYTHONPATH=../Client/src:../Common${PYTHONPATH:+:$PYTHONPATH} \ -- nosetests ${*:--v --traverse-namespace bkr.client.tests} -+ nosetests-2 ${*:--v --traverse-namespace bkr.client.tests} -diff --git a/Common/run-tests.sh b/Common/run-tests.sh -index 2c93d4b..e2d7c39 100755 ---- a/Common/run-tests.sh -+++ b/Common/run-tests.sh -@@ -3,4 +3,4 @@ - set -x - - env PYTHONPATH=.${PYTHONPATH:+:$PYTHONPATH} \ -- nosetests ${*:--v bkr} -+ nosetests-2 ${*:--v bkr} diff --git a/beaker-snapshot.sh b/beaker-snapshot.sh new file mode 100755 index 0000000..190dcff --- /dev/null +++ b/beaker-snapshot.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e +set -o pipefail + +if [ ! -d beaker-checkout ]; then + git clone git://git.beaker-project.org/beaker beaker-checkout + cd beaker-checkout +else + cd beaker-checkout + git pull +fi +NAME="$(git describe)" +git archive --prefix="${NAME}/" -o ../"${NAME}".tar.gz origin/develop +echo "${NAME}" diff --git a/beaker.spec b/beaker.spec index ae90886..485e2f8 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,26 +1,25 @@ %global upstream_name beaker -%global with_docs 0 +%global with_docs 1 +%global git_version 26.5-49-g97e14daec Name: %{upstream_name} Version: 26.5 -Release: 1%{?dist} +Release: 1.git.49.g87e14daec%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ -Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz -# Explicitly remove building server from the Makefiles -Patch1: 0001_dont_build_server.diff -Patch2: 0002_dont_build_documentation.diff -Patch3: 0003_nosetests_python2.diff +# To generate git snapshot, see beaker-snapshot.sh +Source0: %{upstream_name}-%{git_version}.tar.gz +#Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz BuildArch: noarch -BuildRequires: python2-setuptools -BuildRequires: python2-nose -BuildRequires: python2-unittest2 -BuildRequires: python2-mock -BuildRequires: python2-devel -BuildRequires: python2-docutils +BuildRequires: python3-setuptools +BuildRequires: python3-nose +BuildRequires: python3-unittest2 +BuildRequires: python3-mock +BuildRequires: python3-devel +BuildRequires: python3-docutils %if 0%{with_docs} BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain @@ -35,18 +34,18 @@ Obsoletes: %{name} < 0.17.0-1 Summary: Command-line client for interacting with Beaker Requires: %{name}-common = %{version}-%{release} BuildRequires: pkgconfig(bash-completion) -BuildRequires: python2-krbv -BuildRequires: python2-lxml -BuildRequires: python2-libxslt -BuildRequires: python2-prettytable -Requires: python2-setuptools -Requires: python2-krbv -Requires: python2-lxml -Requires: python2-requests -Requires: python2-libxslt -Requires: python2-libxml2 -Requires: python2-prettytable -Requires: python2-jinja2 +BuildRequires: python3-gssapi +BuildRequires: python3-lxml +BuildRequires: python3-prettytable +BuildRequires: python3-libxml2 +Requires: python3-six +Requires: python3-setuptools +Requires: python3-gssapi +Requires: python3-lxml +Requires: python3-requests +Requires: python3-libxml2 +Requires: python3-prettytable +Requires: python3-jinja2 # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -62,13 +61,10 @@ The bkr client is a command-line tool for interacting with Beaker servers. You can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep -%setup -q -n %{upstream_name}-%{version} -%patch1 -p1 +%setup -q -n %{upstream_name}-%{git_version} %if !0%{with_docs} -%patch2 -p1 rm -rf documentation %endif -%patch3 -p1 # 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 @@ -76,36 +72,45 @@ rm -rf documentation rm -r Server IntegrationTests LabController #documentation/server-api %build +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 rm -rf %{buildroot}%{_datadir}/beaker-integration-tests/ -rm -rf %{buildroot}%{python2_sitelib}/bkr/inttest -rm -rf %{buildroot}%{python2_sitelib}/beaker_integration_tests* +rm -rf %{buildroot}%{python3_sitelib}/bkr/inttest +rm -rf %{buildroot}%{python3_sitelib}/beaker_integration_tests* # These are for lab-controller stuff, which depends on server rm -rf %{buildroot}%{_mandir}/man8/ %check +export BKR_PY3=1 make check +# Running the checks generates some .pyc files - burn them! +find %{buildroot} -name '__pycache__' | xargs rm -rf %files common %doc README.md %license COPYING -%dir %{python2_sitelib}/bkr/ -%{python2_sitelib}/bkr/__init__.py* -%{python2_sitelib}/bkr/timeout_xmlrpclib.py* -%{python2_sitelib}/bkr/common/ -%{python2_sitelib}/bkr/log.py* -%{python2_sitelib}/%{name}_common-%{version}-py2.7.egg-info/ +%dir %{python3_sitelib}/bkr/ +%{python3_sitelib}/bkr/__init__.py* +%{python3_sitelib}/bkr/common/ +%{python3_sitelib}/bkr/log.py* +%{python3_sitelib}/%{name}_common-%{version}-py?.?.egg-info/ %files client %dir %{_sysconfdir}/%{name} %doc Client/client.conf.example -%{python2_sitelib}/bkr/client/ -%{python2_sitelib}/%{name}_client-%{version}-py2.7-nspkg.pth -%{python2_sitelib}/%{name}_client-%{version}-py2.7.egg-info/ +%{python3_sitelib}/bkr/client/ +%{python3_sitelib}/%{name}_client-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/%{name}_client-%{version}-py?.?.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr %if 0%{with_docs} @@ -116,6 +121,13 @@ make check %{_datadir}/bash-completion %changelog +* Thu Sep 26 2019 Greg Hellings - 26.5-49-g97e14daec +- Upstream unrelased version +- Updated spec file to match new deps +- Brought spec file in line with upstream file where necessary +- Remove python2 dependency in favor of python3 +- Added shell script to srpm to generate new git file + * Tue Jul 16 2019 Greg Hellings - 26.5-1 - Upstream version 26.5 diff --git a/sources b/sources index c8341cb..ab2620c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.5.tar.xz) = a57e24837888c32a317f74e7a5eef2d874940c60322c655005eb80f8a721e7874b91eb43c503e9257c5e1ee9e20b12e63986889a10dfbbb57e8aefc936025afb +SHA512 (beaker-26.5-49-g97e14daec.tar.gz) = 4abe92c6ea74a2c93c8bc721ebff00fe6b186fff11eadc42da916b88bb9384cd3e27db84f665ceedf273344f9983a65c00ae5b3b69ecc5e83e6c3fb0d482bc60 From 48f3430394f9982c301f30620bc62df577f4a9ae Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 24 Nov 2019 22:11:37 -0600 Subject: [PATCH 27/72] Upstream 26.6 + git --- .gitignore | 1 + beaker.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5a1f64d..4b6789e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ results_beaker /beaker-26.3.tar.xz /beaker-26.5.tar.xz /beaker-26.5-49-g97e14daec.tar.gz +/beaker-26.6-66-g03e169493.tar.gz diff --git a/beaker.spec b/beaker.spec index 485e2f8..b08dbba 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,10 +1,10 @@ %global upstream_name beaker %global with_docs 1 -%global git_version 26.5-49-g97e14daec +%global git_version 26.6-66-g03e169493 Name: %{upstream_name} -Version: 26.5 -Release: 1.git.49.g87e14daec%{?dist} +Version: 26.6 +Release: 1.git.66.g03e169493%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ diff --git a/sources b/sources index ab2620c..bf092c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.5-49-g97e14daec.tar.gz) = 4abe92c6ea74a2c93c8bc721ebff00fe6b186fff11eadc42da916b88bb9384cd3e27db84f665ceedf273344f9983a65c00ae5b3b69ecc5e83e6c3fb0d482bc60 +SHA512 (beaker-26.6-66-g03e169493.tar.gz) = 1b5686d2db9fad1c6530cbd268a2593d7ceae0e888fa521fd79903efaa62848e87b481bfb2b368bb38128ddd25b4aefb8c354b6d4f9ad83b8c352d982c9a0813 From 6d2e7fab8bb0ee85294113cb8f1e4f39d4fb637a Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 19 Dec 2019 22:58:54 -0600 Subject: [PATCH 28/72] Upstream release 27.0 --- .gitignore | 1 + beaker.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4b6789e..0a69548 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ results_beaker /beaker-26.5.tar.xz /beaker-26.5-49-g97e14daec.tar.gz /beaker-26.6-66-g03e169493.tar.gz +/beaker-27.0.tar.xz diff --git a/beaker.spec b/beaker.spec index b08dbba..c6c4de4 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,17 +1,15 @@ %global upstream_name beaker %global with_docs 1 -%global git_version 26.6-66-g03e169493 Name: %{upstream_name} -Version: 26.6 -Release: 1.git.66.g03e169493%{?dist} +Version: 27.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: %{upstream_name}-%{git_version}.tar.gz -#Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz +Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz BuildArch: noarch BuildRequires: python3-setuptools @@ -61,7 +59,7 @@ The bkr client is a command-line tool for interacting with Beaker servers. You can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep -%setup -q -n %{upstream_name}-%{git_version} +%setup -q -n %{upstream_name}-%{version} %if !0%{with_docs} rm -rf documentation %endif @@ -121,6 +119,11 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* Thu Dec 19 2019 Greg Hellings - 27.0-1 +- Upstream release 27.0 +- Drop git chasing +- Python 3 support at last? + * Thu Sep 26 2019 Greg Hellings - 26.5-49-g97e14daec - Upstream unrelased version - Updated spec file to match new deps diff --git a/sources b/sources index bf092c3..5952560 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.6-66-g03e169493.tar.gz) = 1b5686d2db9fad1c6530cbd268a2593d7ceae0e888fa521fd79903efaa62848e87b481bfb2b368bb38128ddd25b4aefb8c354b6d4f9ad83b8c352d982c9a0813 +SHA512 (beaker-27.0.tar.xz) = 479811bf80f96093e85874b9f173ea9f055ca3e75e5ab4b43fab4c5d57a3e9ae987bd0800f7c3a469421b1bf28e4be674e159dd06b13e4be231a5a39bf2d804a From cd0edc3aebeeee593775e0a80c9eb601d2906632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 9 Jan 2020 21:55:41 +0100 Subject: [PATCH 29/72] Remove dependency on unittest2 --- beaker.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/beaker.spec b/beaker.spec index c6c4de4..6bd2320 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 27.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/ @@ -14,7 +14,6 @@ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}. BuildArch: noarch BuildRequires: python3-setuptools BuildRequires: python3-nose -BuildRequires: python3-unittest2 BuildRequires: python3-mock BuildRequires: python3-devel BuildRequires: python3-docutils @@ -119,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From f6e42361e0850672957bf6c5120128433e1a4213 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:49:04 +0000 Subject: [PATCH 30/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 6bd2320..03a7ddc 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 27.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 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) From 6c3e0c773d1eab1fd313fbd2deab5ac27618e59a Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 29 Jan 2020 13:05:07 +0100 Subject: [PATCH 31/72] Upstream 27.1 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a69548..d8976ac 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ results_beaker /beaker-26.5-49-g97e14daec.tar.gz /beaker-26.6-66-g03e169493.tar.gz /beaker-27.0.tar.xz +/beaker-27.1.tar.xz diff --git a/beaker.spec b/beaker.spec index 03a7ddc..8a50668 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 27.0 -Release: 3%{?dist} +Version: 27.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 +* 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 diff --git a/sources b/sources index 5952560..4fa3773 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-27.0.tar.xz) = 479811bf80f96093e85874b9f173ea9f055ca3e75e5ab4b43fab4c5d57a3e9ae987bd0800f7c3a469421b1bf28e4be674e159dd06b13e4be231a5a39bf2d804a +SHA512 (beaker-27.1.tar.xz) = 8762c41ff74527474baa477f6e0d10ca5221f4c7b280ec7453919b6b7b72f837361647d785c352404a5b165c4ddc2e231cd7fecfd2e6be74eb0025b9c998a14d From 156192088aa0a9f16aacbce0ce6ad1be2a93839a Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Thu, 27 Feb 2020 18:04:36 +0100 Subject: [PATCH 32/72] Upstream 27.2 Signed-off-by: Martin Styk --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d8976ac..cf5f7fa 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ results_beaker /beaker-26.6-66-g03e169493.tar.gz /beaker-27.0.tar.xz /beaker-27.1.tar.xz +/beaker-27.2.tar.xz diff --git a/beaker.spec b/beaker.spec index 8a50668..bb31cba 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,7 +2,7 @@ %global with_docs 1 Name: %{upstream_name} -Version: 27.1 +Version: 27.2 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* Thu Feb 27 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) diff --git a/sources b/sources index 4fa3773..1b2ace7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-27.1.tar.xz) = 8762c41ff74527474baa477f6e0d10ca5221f4c7b280ec7453919b6b7b72f837361647d785c352404a5b165c4ddc2e231cd7fecfd2e6be74eb0025b9c998a14d +SHA512 (beaker-27.2.tar.xz) = 25dd0d415393ec55a87136c273e27beddfdc18c2d97a6498fd51b56ba0cd474ad41858790b55fef3e780c728af26bc0746682a7ce8d1feb5a21550e4fb027f90 From 7e96a9eacd99924b56a328a458fc54bc92c32599 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 18 Mar 2020 19:25:46 +0100 Subject: [PATCH 33/72] Upstream 27.3 Signed-off-by: Martin Styk --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf5f7fa..26c8b73 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ results_beaker /beaker-27.0.tar.xz /beaker-27.1.tar.xz /beaker-27.2.tar.xz +/beaker-27.3.tar.xz diff --git a/beaker.spec b/beaker.spec index bb31cba..2314088 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,7 +2,7 @@ %global with_docs 1 Name: %{upstream_name} -Version: 27.2 +Version: 27.3 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* Wed Mar 18 2020 Martin Styk - 27.3-1: +- Update to 27.3 (#1814828) + * Thu Feb 27 2020 Martin Styk - 27.2-1 - Update to 27.2 (#1808021) diff --git a/sources b/sources index 1b2ace7..8318c32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-27.2.tar.xz) = 25dd0d415393ec55a87136c273e27beddfdc18c2d97a6498fd51b56ba0cd474ad41858790b55fef3e780c728af26bc0746682a7ce8d1feb5a21550e4fb027f90 +SHA512 (beaker-27.3.tar.xz) = 553c77ba8a078c33a8d874b5b2585521820426dc049d4e520d0dad5253b39b9240545b6486a9b334a912aa2d9733d14c0b487565dca7e3df928230639ba1a172 From 10d301fbfb1442608b024b13b6ff0867e61ab1e7 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Mon, 30 Mar 2020 10:08:10 +0200 Subject: [PATCH 34/72] Upstream 27.4 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 26c8b73..9516918 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ results_beaker /beaker-27.1.tar.xz /beaker-27.2.tar.xz /beaker-27.3.tar.xz +/beaker-27.4.tar.xz diff --git a/beaker.spec b/beaker.spec index 2314088..58e40a0 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,7 +2,7 @@ %global with_docs 1 Name: %{upstream_name} -Version: 27.3 +Version: 27.4 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD @@ -118,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* Mon Mar 30 2020 Martin Styk - 27.4-1: +- Update to 27.4 (#1818717) + * Wed Mar 18 2020 Martin Styk - 27.3-1: - Update to 27.3 (#1814828) diff --git a/sources b/sources index 8318c32..1f00bd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-27.3.tar.xz) = 553c77ba8a078c33a8d874b5b2585521820426dc049d4e520d0dad5253b39b9240545b6486a9b334a912aa2d9733d14c0b487565dca7e3df928230639ba1a172 +SHA512 (beaker-27.4.tar.xz) = 9cf8fa07a7c029290f6a6825b57fc9cbb631e91922872d9f23812f7bf529089244200dab3190f3ec8fdec860c22a75669160c2c77200244152aac12e6694fb80 From 36594eca498d4f010f271444247b534de7dbb089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:41:27 +0200 Subject: [PATCH 35/72] Rebuilt for Python 3.9 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 58e40a0..f57eae8 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 27.4 -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 +* Tue May 26 2020 Miro Hrončok - 27.4-2 +- Rebuilt for Python 3.9 + * Mon Mar 30 2020 Martin Styk - 27.4-1: - Update to 27.4 (#1818717) From 63f026e739a6a47b6cc1b2ab90c0cf8645ef92b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 13 Jul 2020 21:04:21 +0200 Subject: [PATCH 36/72] Replace Python version glob with macro (needed for Python 3.10+) See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQIGCQCRNBYNXBX2ICWEM3PLDLNOG2ZT/ Co-authored-by: Tomas Hrnciar --- beaker.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/beaker.spec b/beaker.spec index f57eae8..7b5257c 100644 --- a/beaker.spec +++ b/beaker.spec @@ -100,14 +100,14 @@ 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?.?.egg-info/ +%{python3_sitelib}/%{name}_common-%{version}-py%{python3_version}.egg-info/ %files client %dir %{_sysconfdir}/%{name} %doc Client/client.conf.example %{python3_sitelib}/bkr/client/ -%{python3_sitelib}/%{name}_client-%{version}-py?.?-nspkg.pth -%{python3_sitelib}/%{name}_client-%{version}-py?.?.egg-info/ +%{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}-nspkg.pth +%{python3_sitelib}/%{name}_client-%{version}-py%{python3_version}.egg-info/ %{_bindir}/%{name}-wizard %{_bindir}/bkr %if 0%{with_docs} From 3b767ce3b509e4cc8fdb1505acfac5af515e5765 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:00:38 +0000 Subject: [PATCH 37/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 7b5257c..542728b 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 27.4 -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 +* 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 From b97e11f081fe192249e2c279e63e55466c7d90fb Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Tue, 25 Aug 2020 08:35:35 +0200 Subject: [PATCH 38/72] Upstream 28.0 --- .gitignore | 1 + beaker.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9516918..c237a1d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ results_beaker /beaker-27.2.tar.xz /beaker-27.3.tar.xz /beaker-27.4.tar.xz +/beaker-28.0.tar.xz diff --git a/beaker.spec b/beaker.spec index 542728b..180ae92 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 27.4 -Release: 3%{?dist} +Version: 28.0 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -118,6 +118,8 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 1f00bd9..2dd4d17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-27.4.tar.xz) = 9cf8fa07a7c029290f6a6825b57fc9cbb631e91922872d9f23812f7bf529089244200dab3190f3ec8fdec860c22a75669160c2c77200244152aac12e6694fb80 +SHA512 (beaker-28.0.tar.xz) = b738b4a5b25e19bf9be01ce06b67390d594278ffd22e17d59da0e7818dfdbd02b4955c1dab06cbc14a9abd125749c2463217c6aa2a34a9077ad4fd3dde0c5df9 From 0b7b0f9fc7c8c826f9ffb57c3f08aeb5a15ea7e9 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 02:47:27 +0000 Subject: [PATCH 39/72] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- beaker.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/beaker.spec b/beaker.spec index 180ae92..ede2036 100644 --- a/beaker.spec +++ b/beaker.spec @@ -35,6 +35,7 @@ BuildRequires: python3-gssapi BuildRequires: python3-lxml BuildRequires: python3-prettytable BuildRequires: python3-libxml2 +BuildRequires: make Requires: python3-six Requires: python3-setuptools Requires: python3-gssapi From 113f2f026ec182c965e7a09a547a8cfbd77d66f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:01:48 +0000 Subject: [PATCH 40/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 ede2036..2219e87 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.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/ @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From f4aa7d8e66c3071af6d8a2f42851efd629d5b6fc Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Thu, 28 Jan 2021 15:49:05 +0000 Subject: [PATCH 41/72] Upstream 28.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 c237a1d..28f8fc9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ results_beaker /beaker-27.3.tar.xz /beaker-27.4.tar.xz /beaker-28.0.tar.xz +/beaker-28.1.tar.xz diff --git a/beaker.spec b/beaker.spec index 2219e87..f579818 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 28.0 -Release: 2%{?dist} +Version: 28.1 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 2dd4d17..4fb22eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-28.0.tar.xz) = b738b4a5b25e19bf9be01ce06b67390d594278ffd22e17d59da0e7818dfdbd02b4955c1dab06cbc14a9abd125749c2463217c6aa2a34a9077ad4fd3dde0c5df9 +SHA512 (beaker-28.1.tar.xz) = 6286ed50f53ce55eeec215f27eec11740bd8d7a538a38e51a3bfc64492ac9351f5c615049cc4c99b2d5bbba68355f7fbdc077c80332bdb1f3530fe79b0b43a6d From e5d16659c1f6fed0ff2c2bed7070424a46607277 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Wed, 17 Feb 2021 12:35:48 +0000 Subject: [PATCH 42/72] Upstream 28.2 Signed-off-by: Martin Styk --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28f8fc9..f287bb5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ results_beaker /beaker-27.4.tar.xz /beaker-28.0.tar.xz /beaker-28.1.tar.xz +/beaker-28.2.tar.xz diff --git a/beaker.spec b/beaker.spec index f579818..b1c9dc4 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,7 +2,7 @@ %global with_docs 1 Name: %{upstream_name} -Version: 28.1 +Version: 28.2 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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) diff --git a/sources b/sources index 4fb22eb..c691a2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-28.1.tar.xz) = 6286ed50f53ce55eeec215f27eec11740bd8d7a538a38e51a3bfc64492ac9351f5c615049cc4c99b2d5bbba68355f7fbdc077c80332bdb1f3530fe79b0b43a6d +SHA512 (beaker-28.2.tar.xz) = 061750b72c2a085561eae41637081801500b8944af32d8e9ab7e09b20b08a7cd4a338bedb1ef6e071bb7e3ca21cb6ab681d4af6d8a5c2bf7173369a39bb1401d From 80d812b51ccdad88c8404187c64b202bb5e9f508 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:00:15 +0200 Subject: [PATCH 43/72] Rebuilt for Python 3.10 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index b1c9dc4..954ff15 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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) From a0305778f6fe0dada29317f9498621a78e5a269b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:33:12 +0000 Subject: [PATCH 44/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d2454a8e0620dadeb21018c502231ff943b25fe2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:29:32 +0000 Subject: [PATCH 45/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 954ff15..bdda052 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From c910f7e25e2324ead98ba9b67825b98edaa4afc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:13:23 +0000 Subject: [PATCH 46/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 bdda052..c74e741 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -119,6 +119,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From 7a42f7237e223e5a305099a3f2ebd9fa9f11f533 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Sat, 21 May 2022 17:59:15 +0000 Subject: [PATCH 47/72] Upstream 28.3 Signed-off-by: Martin Styk --- beaker.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/beaker.spec b/beaker.spec index c74e741..97e78ec 100644 --- a/beaker.spec +++ b/beaker.spec @@ -2,8 +2,8 @@ %global with_docs 1 Name: %{upstream_name} -Version: 28.2 -Release: 4%{?dist} +Version: 28.3 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system License: GPLv2+ and BSD URL: https://beaker-project.org/ @@ -13,8 +13,7 @@ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}. BuildArch: noarch BuildRequires: python3-setuptools -BuildRequires: python3-nose -BuildRequires: python3-mock +BuildRequires: python3-pytest BuildRequires: python3-devel BuildRequires: python3-docutils %if 0%{with_docs} @@ -119,6 +118,9 @@ find %{buildroot} -name '__pycache__' | xargs rm -rf %{_datadir}/bash-completion %changelog +* 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 From 733e55fb683b12c71987ee58bda1f4da6dc700c2 Mon Sep 17 00:00:00 2001 From: Martin Styk Date: Sat, 21 May 2022 18:04:49 +0000 Subject: [PATCH 48/72] Release 28.3 sources Signed-off-by: Martin Styk --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f287bb5..870c1a4 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ results_beaker /beaker-28.0.tar.xz /beaker-28.1.tar.xz /beaker-28.2.tar.xz +/beaker-28.3.tar.xz diff --git a/sources b/sources index c691a2d..45784f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-28.2.tar.xz) = 061750b72c2a085561eae41637081801500b8944af32d8e9ab7e09b20b08a7cd4a338bedb1ef6e071bb7e3ca21cb6ab681d4af6d8a5c2bf7173369a39bb1401d +SHA512 (beaker-28.3.tar.xz) = 0334f4329ee6ef9d83313ea7a44720234570a69c91fea35ec8f57a26e41c167a50d8f1ffeafcf66d272d0bfb55a2a81c485bb9b9147a15460a0e3c6fa92939c7 From 0ec15fa024702ffdc3b0dde4438dd66f80600080 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 18:16:57 +0200 Subject: [PATCH 49/72] Rebuilt for Python 3.11 --- beaker.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beaker.spec b/beaker.spec index 97e78ec..74c79ff 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -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 +* 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) From ea38cec880548df9434aa87734a40f5def8fb31e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:51:57 +0000 Subject: [PATCH 50/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 74c79ff..3b8cd67 100644 --- a/beaker.spec +++ b/beaker.spec @@ -3,7 +3,7 @@ Name: %{upstream_name} Version: 28.3 -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 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 From 93d520e6cb1f6b05c2951daba1611c398c2e92ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:45:36 +0000 Subject: [PATCH 51/72] 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 52/72] 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 53/72] 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 54/72] 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 55/72] 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 56/72] 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 57/72] 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 58/72] 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 59/72] 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 60/72] 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 61/72] 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 62/72] 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 63/72] 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 64/72] 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 65/72] 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 66/72] 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 67/72] 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 68/72] 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 69/72] 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 70/72] 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 71/72] 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 72/72] 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