Sync with upstream release 112.0

Signed-off-by: Cleber Rosa <crosa@redhat.com>

.gitignore

@@ -28,18 +28,8 @@
 /avocado-79.0.tar.gz
 /avocado-80.0.tar.gz
 /avocado-82.0.tar.gz
-/avocado-83.0.tar.gz
+/avocado-92.0.tar.gz
-/avocado-84.0.tar.gz
+/avocado-92.1.tar.gz
-/avocado-85.0.tar.gz
+/avocado-92.1-python312.patch
-/avocado-86.0.tar.gz
+/avocado-92.3.tar.gz
-/avocado-87.0.tar.gz
-/avocado-88.1.tar.gz
-/avocado-89.0.tar.gz
-/avocado-90.0.tar.gz
-/avocado-95.0.tar.gz
-/avocado-95.0-resultsdb_api.patch
-/avocado-96.0.tar.gz
-/avocado-97.0.tar.gz
-/avocado-98.0.tar.gz
-/avocado-102.0.tar.gz
 /avocado-112.0.tar.gz

avocado-89.0-passtest-path-fix.patch

@@ -1,24 +0,0 @@
-From 8e2d7da5868ca2ae1c66c24a3e5c2957daffc7d7 Mon Sep 17 00:00:00 2001
-From: Merlin Mathesius <mmathesi@redhat.com>
-Date: Thu, 1 Jul 2021 15:04:14 -0500
-Subject: [PATCH] Specify the complete relative path to passtest.py in
- HtmlResultTest.test_output_compatible_setup_2 so it finds the script to run.
-
-Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>
----
- optional_plugins/html/tests/test_html_result.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/optional_plugins/html/tests/test_html_result.py b/optional_plugins/html/tests/test_html_result.py
-index b123a669aa..e074d3bc3a 100644
---- a/optional_plugins/html/tests/test_html_result.py
-+++ b/optional_plugins/html/tests/test_html_result.py
-@@ -53,7 +53,7 @@ def test_output_compatible_setup_2(self):
-         tmpfile3 = os.path.join(tmpdir, "result.html")
-         cmd_line = ('avocado run --job-results-dir %s --disable-sysinfo '
-                     '--xunit %s --json %s --html %s --tap-include-logs '
--                    'passtest.py' % (self.tmpdir.name, tmpfile, tmpfile2, tmpfile3))
-+                    'examples/tests/passtest.py' % (self.tmpdir.name, tmpfile, tmpfile2, tmpfile3))
-         result = process.run(cmd_line, ignore_status=True)
-         output = result.stdout + result.stderr
-         expected_rc = exit_codes.AVOCADO_ALL_OK

python-avocado.spec

@@ -37,7 +37,7 @@
 
 Name: python-avocado
 Version: 112.0
-Release: 2%{?gitrel}%{?dist}
+Release: 1%{?gitrel}%{?dist}
 Summary: Framework with tools and libraries for Automated Testing
 # Found licenses:
 # avocado/core/tapparser.py: MIT
@@ -47,7 +47,7 @@ Summary: Framework with tools and libraries for Automated Testing
 # optional_plugins/html/avocado_result_html/templates/bootstrap.min.js: MIT
 # selftests/.data/jenkins-junit.xsd: MIT
 # Other files: GPLv2 and GPLv2+
-License: GPL-2.0-or-later AND GPL-2.0-only AND MIT
+License: GPLv2+ and GPLv2 and MIT
 URL: https://avocado-framework.github.io/
 Source0: https://github.com/avocado-framework/avocado/archive/%{gitref}/%{gittar}
 BuildArch: noarch
@@ -349,7 +349,7 @@ Common files (such as configuration) for the Avocado Testing Framework.
 
 %package -n python3-avocado-plugins-output-html
 Summary: Avocado HTML report plugin
-License: GPL-2.0-or-later AND MIT
+License: GPLv2+ and MIT
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-output-html
@@ -365,7 +365,7 @@ arbitrary filesystem location.
 %if %{with_resultsdb}
 %package -n python3-avocado-plugins-resultsdb
 Summary: Avocado plugin to propagate job results to ResultsDB
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-resultsdb
@@ -381,7 +381,7 @@ server.
 
 %package -n python3-avocado-plugins-varianter-yaml-to-mux
 Summary: Avocado plugin to generate variants out of yaml files
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-varianter-yaml-to-mux
@@ -395,7 +395,7 @@ defined in a yaml file(s).
 
 %package -n python3-avocado-plugins-golang
 Summary: Avocado plugin for execution of golang tests
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 Requires: golang
 
@@ -412,7 +412,7 @@ also run them.
 %if ! 0%{?rhel}
 %package -n python3-avocado-plugins-ansible
 Summary: Avocado Ansible Dependency plugin
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 Requires: ansible-core
 
@@ -429,7 +429,7 @@ tests.
 
 %package -n python3-avocado-plugins-varianter-pict
 Summary: Varianter with combinatorial capabilities by PICT
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-varianter-pict
@@ -443,7 +443,7 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing.
 
 %package -n python3-avocado-plugins-varianter-cit
 Summary: Varianter with Combinatorial Independent Testing capabilities
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-varianter-cit
@@ -458,7 +458,7 @@ collaboration with CVUT Prague.
 
 %package -n python3-avocado-plugins-result-upload
 Summary: Avocado plugin propagate job results to a remote host
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-result-upload
@@ -471,7 +471,7 @@ a dedicated sever.
 
 %package -n python3-avocado-plugins-result-mail
 Summary: Avocado Mail Notification for Jobs
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-result-mail
@@ -485,7 +485,7 @@ for job start and completion events within the Avocado testing framework.
 %if ! 0%{?rhel}
 %package -n python3-avocado-plugins-spawner-remote
 Summary: Avocado Plugin to spawn tests on a remote host
-License: GPL-2.0-or-later
+License: GPLv2+
 Requires: python3-avocado == %{version}-%{release}
 
 %description -n python3-avocado-plugins-spawner-remote
@@ -498,7 +498,7 @@ This optional plugin is intended to spawn tests on a remote host.
 
 %package -n python-avocado-examples
 Summary: Avocado Test Framework Example Tests
-License: GPL-2.0-or-later
+License: GPLv2+
 # documentation does not require main package, but needs to be in lock-step if present
 Conflicts: python3-avocado < %{version}-%{release}, python3-avocado > %{version}-%{release}
 
@@ -520,7 +520,7 @@ examples of how to write tests on your own.
 
 %package -n python-avocado-bash
 Summary: Avocado Test Framework Bash Utilities
-License: GPL-2.0-or-later AND GPLv-2.0-only
+License: GPLv2+ and GPLv2
 Requires: python-avocado-common == %{version}-%{release}
 
 %description -n python-avocado-bash
@@ -538,9 +538,6 @@ Again Shell code (and possibly other similar shells).
 
 
 %changelog
-* Fri Nov 07 2025 Cleber Rosa  <crosa@redhat.com> - 112.0-2
-- Update license format to match The System Package Data Exchange (SPDX)
-
 * Fri Oct 10 2025 Cleber Rosa  <crosa@redhat.com> - 112.0-1
 - Sync with upstream release 112.0
 - Removed python3-elementpath build requirement
@@ -554,76 +551,85 @@ Again Shell code (and possibly other similar shells).
   nrunner.py:TaskRunStatusService.test_task_status_service_lost
 - Require gcc, gdb and gdb-gdbserver for tests
 
-* Mon Jul 17 2023 Cleber Rosa <crosa@redhat.com> - 102.0-1
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 92.3-6
-- Sync with upstream release 102.0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-- Added new avocado-runner-podman-image script
-- Added new sub package python3-avocado-plugins-ansible
-- Remove generic runner avocado-runner
 
-* Sat Jul 16 2022 Cleber Rosa <crosa@redhat.com> - 98.0-1
+* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 92.3-5
-- Sync with upstream release 98.0
+- Rebuilt for Python 3.14
-- Add build requirements for python3-elementpath and
-  python3-xmlschema, used on some tests
-- Changed regex to match new string quote style
 
-* Tue May 24 2022 Cleber Rosa <crosa@redhat.com> - 97.0-1
+* Mon Jan 20 2025 Miro Hrončok <mhroncok@redhat.com> - 92.3-4
-- Sync with upstream release 97.0
+- Loosen the PyYAML version requirement in python3-avocado-plugins-varianter-yaml-to-mux
-- Require python3-jsonschema when running tests
-- Removed wrapper examples
 
-* Tue Apr  5 2022 Cleber Rosa <crosa@redhat.com> - 96.0-1
+* Mon Jan 20 2025 Cleber Rosa <crosa@redhat.com> - 92.3-3
-- Sync with upstream release 96.0.
+- convert remaining licenses to SPDX
-- Rename requirements to dependencies
-- Dropped patch that pins resultsdb_api to working version
 
-* Thu Mar 17 2022 Cleber Rosa <crosa@redhat.com> - 95.0-1
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 92.3-2
-- Sync with upstream release 95.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-- Added new binary for 'avocado-external-runner'
-- Removed executable mode from avocado/core/nrunner.py
-- Adjust selftest/check.py to use new --skip option
-- Do not require genisoimage on EL9
-- Replace the %global with_tests macro with %bcond_without to allow
-  disable the tests directly in the command line.
-- Removed avocado-runner-exec since we have avocado-runner-exec-test.
-- Added avocado-runner-sysinfo in package
-- Added upstream patch that pins resultsdb_api to working version.
 
-* Tue Jul 27 2021 Cleber Rosa <crosa@redhat.com> - 90.0-1
+* Mon Aug 19 2024 Cleber Rosa <crosa@redhat.com> - 92.3-1
-- Sync with upstream release 90.0.
+- Updated to 92.3
-- Removed patch already included upstream
+- Support building and running under Python 3.13 for F42
+- Removed patch from 92.1 as its present in 92.3
 
-* Tue Jun 29 2021 Merlin Mathesius <mmathesi@redhat.com> - 89.0-2
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 92.1-8
-- Spec file cleanup identified during package review to bring back
+- convert license to SPDX
-  non-modular version of package.
 
-* Tue Jun 22 2021 Cleber Rosa <cleber@redhat.com> - 89.0-1
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 92.1-7
-- Sync with upstream release 89.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-- Packaged avocado-runner-dry-run and avocado-runner-requirement-asset
 
-* Tue May 18 2021 Cleber Rosa <cleber@redhat.com> - 88.1-1
+* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 92.1-6
-- Sync with upstream release 88.1.
+- Rebuilt for Python 3.13
-- Included avocado-runner-requirement-package executables
 
-* Wed Apr 14 2021 Cleber Rosa <cleber@redhat.com> - 87.0-1
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 92.1-5
-- Sync with upstream release 87.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Tue Mar 16 2021 Cleber Rosa <cleber@redhat.com> - 86.0-1
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 92.1-4
-- Sync with upstream release 86.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-- Do not depend on make to build man page
 
-* Wed Feb 10 2021 Cleber Rosa <cleber@redhat.com> - 85.0-1
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 92.1-3
-- Sync with upstream release 85.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Wed Feb 10 2021 Cleber Rosa <cleber@redhat.com> - 84.0-1
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 92.1-2
-- Sync with upstream release 84.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-- Drop old Fedora conditionals
+
+* Mon Jul 17 2023 Cleber Rosa <crosa@redhat.com> - 92.1-1
+- Updated to 92.1
+- Support building and running under Python 3.12 for F39
+
+* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 92.0-3
+- Rebuilt for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 92.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Aug  9 2022 Cleber Rosa <crosa@redhat.com> - 92.0-1
 - Use selftests/check.py job instead of more limited selftests/run
+- Included avocado-runner-sysinfo, avocado-runner-requirement-package,
+  avocado-runner-requirement-asset and avocado-runner-dry-run and
+  avocado-runner-golang executables
+- Removed avocado-runner-exec executable
+- Removed loader_yaml and glib plugin packages
 
-* Tue Nov 17 2020 Cleber Rosa <cleber@redhat.com> - 83.0-1
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 82.0-7
-- Sync with upstream release 83.0.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-- Added avocado-runner-golang script to golang package
+
-- Removed glib plugin
+* Tue Jun 21 2022 Python Maint <python-maint@redhat.com> - 82.0-6
-- Removed yaml to mux loader plugin
+- Rebuilt for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 82.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 28 2021 Merlin Mathesius <mmathesi@redhat.com> - 82.0-4
+- Loosen jinja2 version requirement to fix FTBFS in Rawhide
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 82.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Mar 18 2021 Merlin Mathesius <mmathesi@redhat.com> - 82.0-2
+- Drop obsolete packages from BuildRequires
+- Generate man page directly using 'rst2man' rather than requiring 'make'
+- Adjust PATH to make sure self-tests find internal modules
+- Spec file cleanup following package review.
 
 * Mon Sep 14 2020 Cleber Rosa <cleber@redhat.com> - 82.0-1
 - Sync with upstream release 82.0.