Skip to content

Commit bad0301

Browse files
committed
python-avocado.spec: update format of license to match SPDX
This was suggested in a Fedora package interaction. Reference: https://spdx.org/licenses/ Signed-off-by: Cleber Rosa <crosa@redhat.com>
1 parent 3534d96 commit bad0301

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

python-avocado.spec

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
Summary: Framework with tools and libraries for Automated Testing
2929
Name: python-avocado
3030
Version: 112.0
31-
Release: 1%{?gitrel}%{?dist}
32-
License: GPLv2+ and GPLv2 and MIT
31+
Release: 2%{?gitrel}%{?dist}
32+
License: GPL-2.0-or-later AND GPL-2.0-only AND MIT
3333
URL: https://avocado-framework.github.io/
3434
%if 0%{?rel_build}
3535
Source0: https://github.com/avocado-framework/avocado/archive/%{version}/%{gittar}
@@ -270,7 +270,7 @@ PATH=%{buildroot}%{_bindir}:%{buildroot}%{_libexecdir}/avocado:$PATH \
270270

271271
%package -n python3-avocado-common
272272
Summary: Avocado common files
273-
License: GPLv2+
273+
License: GPL-2.0-or-later
274274

275275
%description -n python3-avocado-common
276276
Common files (such as configuration) for the Avocado Testing Framework.
@@ -297,7 +297,7 @@ Common files (such as configuration) for the Avocado Testing Framework.
297297

298298
%package -n python3-avocado-plugins-output-html
299299
Summary: Avocado HTML report plugin
300-
License: GPLv2+ and MIT
300+
License: GPL-2.0-or-later AND GPL-2.0-only AND MIT
301301
Requires: python3-avocado == %{version}-%{release}
302302
Requires: python3-jinja2
303303

@@ -314,7 +314,7 @@ arbitrary filesystem location.
314314
%if ! 0%{?fedora} > 35
315315
%package -n python3-avocado-plugins-resultsdb
316316
Summary: Avocado plugin to propagate job results to ResultsDB
317-
License: GPLv2+
317+
License: GPL-2.0-or-later
318318
Requires: python3-avocado == %{version}-%{release}
319319
Requires: python3-resultsdb_api
320320

@@ -330,7 +330,7 @@ server.
330330

331331
%package -n python3-avocado-plugins-varianter-yaml-to-mux
332332
Summary: Avocado plugin to generate variants out of yaml files
333-
License: GPLv2+
333+
License: GPL-2.0-or-later
334334
Requires: python3-avocado == %{version}-%{release}
335335
Requires: python3-yaml
336336

@@ -344,7 +344,7 @@ defined in a yaml file(s).
344344

345345
%package -n python3-avocado-plugins-golang
346346
Summary: Avocado Plugin for Execution of golang tests
347-
License: GPLv2+
347+
License: GPL-2.0-or-later
348348
Requires: python3-avocado == %{version}-%{release}
349349
Requires: golang
350350

@@ -360,7 +360,7 @@ also run them.
360360
%if ! 0%{?rhel}
361361
%package -n python3-avocado-plugins-ansible
362362
Summary: Avocado Ansible Dependency plugin
363-
License: GPLv2+
363+
License: GPL-2.0-or-later
364364
Requires: python3-avocado == %{version}-%{release}
365365
Requires: ansible-core
366366

@@ -376,7 +376,7 @@ tests.
376376

377377
%package -n python3-avocado-plugins-varianter-pict
378378
Summary: Varianter with combinatorial capabilities by PICT
379-
License: GPLv2+
379+
License: GPL-2.0-or-later
380380
Requires: python3-avocado == %{version}-%{release}
381381

382382
%description -n python3-avocado-plugins-varianter-pict
@@ -389,7 +389,7 @@ Pair-Wise algorithms, also known as Combinatorial Independent Testing.
389389

390390
%package -n python3-avocado-plugins-varianter-cit
391391
Summary: Varianter with Combinatorial Independent Testing capabilities
392-
License: GPLv2+
392+
License: GPL-2.0-or-later
393393
Requires: python3-avocado == %{version}-%{release}
394394

395395
%description -n python3-avocado-plugins-varianter-cit
@@ -403,7 +403,7 @@ collaboration with CVUT Prague.
403403

404404
%package -n python3-avocado-plugins-result-upload
405405
Summary: Avocado Plugin to propagate Job results to a remote host
406-
License: GPLv2+
406+
License: GPL-2.0-or-later
407407
Requires: python3-avocado == %{version}-%{release}
408408

409409
%description -n python3-avocado-plugins-result-upload
@@ -416,7 +416,7 @@ a dedicated sever.
416416

417417
%package -n python3-avocado-plugins-result-mail
418418
Summary: Avocado Mail Notification for Jobs
419-
License: GPLv2+
419+
License: GPL-2.0-or-later
420420
Requires: python3-avocado == %{version}-%{release}
421421

422422
%description -n python3-avocado-plugins-result-mail
@@ -430,7 +430,7 @@ for job start and completion events within the Avocado testing framework.
430430
%if ! 0%{?rhel}
431431
%package -n python3-avocado-plugins-spawner-remote
432432
Summary: Avocado Plugin to spawn tests on a remote host
433-
License: GPLv2+
433+
License: GPL-2.0-or-later
434434
Requires: python3-avocado == %{version}-%{release}
435435

436436
%description -n python3-avocado-plugins-spawner-remote
@@ -443,7 +443,7 @@ This optional plugin is intended to spawn tests on a remote host.
443443

444444
%package -n python3-avocado-examples
445445
Summary: Avocado Test Framework Example Tests
446-
License: GPLv2+
446+
License: GPL-2.0-or-later
447447
Requires: python3-avocado == %{version}-%{release}
448448

449449
%description -n python3-avocado-examples
@@ -463,7 +463,7 @@ examples of how to write tests on your own.
463463

464464
%package -n python3-avocado-bash
465465
Summary: Avocado Test Framework Bash Utilities
466-
License: GPLv2+ and GPLv2
466+
License: GPL-2.0-or-later AND GPL-2.0-only
467467
Requires: python3-avocado == %{version}-%{release}
468468

469469
%description -n python3-avocado-bash
@@ -475,6 +475,9 @@ Again Shell code (and possibly other similar shells).
475475
%{_libexecdir}/avocado*
476476

477477
%changelog
478+
* Thu Dec 04 2025 Cleber Rosa <crosa@redhat.com> - 112.0-2
479+
- Update license format to match The System Package Data Exchange (SPDX)
480+
478481
* Wed Sep 24 2025 Jan Richter <jarichte@redhat.com> - 112.0-1
479482
- New release
480483

0 commit comments

Comments
 (0)