From 1fa1abdca0722e13b07520ba5481e8691443f0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 09:24:18 +0200 Subject: [PATCH] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- koji.spec | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/koji.spec b/koji.spec index 577e3aa..9ea11e5 100644 --- a/koji.spec +++ b/koji.spec @@ -9,9 +9,10 @@ Name: koji Version: 1.34.1 -Release: 5%{?dist} +Release: 6%{?dist} # the included arch lib from yum's rpmUtils is GPLv2+ -License: LGPLv2 and GPLv2+ +# Automatically converted from old format: LGPLv2 and GPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 AND GPL-2.0-or-later Summary: Build system tools URL: https://pagure.io/koji/ Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2 @@ -81,7 +82,8 @@ This subpackage provides python functions and libraries. %package -n python%{python3_pkgversion}-%{name}-cli-plugins Summary: Koji client plugins -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name}-cli-plugins @@ -89,7 +91,8 @@ Plugins to the koji command-line interface %package hub Summary: Koji XMLRPC interface -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name} = %{version}-%{release} Requires: %{name}-hub-code %if 0%{?fedora} || 0%{?rhel} > 7 @@ -102,7 +105,8 @@ koji-hub is the XMLRPC interface to the koji database %package -n python%{python3_pkgversion}-%{name}-hub Summary: Koji XMLRPC interface -License: LGPLv2 and GPLv2 +# Automatically converted from old format: LGPLv2 and GPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 AND GPL-2.0-only # rpmdiff lib (from rpmlint) is GPLv2 (only) Requires: httpd Requires: python%{python3_pkgversion}-mod_wsgi @@ -116,7 +120,8 @@ koji-hub is the XMLRPC interface to the koji database %package hub-plugins Summary: Koji hub plugins -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name}-hub-plugins-code = %{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 Suggests: python%{python3_pkgversion}-%{name}-hub-plugins @@ -127,7 +132,8 @@ Plugins to the koji XMLRPC interface %package -n python%{python3_pkgversion}-%{name}-hub-plugins Summary: Koji hub plugins -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: python%{python3_pkgversion}-%{name}-hub = %{version}-%{release} Requires: python%{python3_pkgversion}-qpid-proton Requires: cpio @@ -138,7 +144,8 @@ Plugins to the koji XMLRPC interface %package builder-plugins Summary: Koji builder plugins -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name} = %{version}-%{release} Requires: %{name}-builder = %{version}-%{release} @@ -147,7 +154,8 @@ Plugins for the koji build daemon %package builder Summary: Koji RPM builder daemon -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: mock >= 0.9.14 Requires(pre): /usr/sbin/useradd Requires: squashfs-tools @@ -170,7 +178,8 @@ tasks that come through the Koji system. %package vm Summary: Koji virtual machine management daemon -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name} = %{version}-%{release} Requires(post): systemd Requires(preun): systemd @@ -186,7 +195,8 @@ virtual machine. This package is not required for most installations. %package utils Summary: Koji Utilities -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name} = %{version}-%{release} Requires: python%{python3_pkgversion}-psycopg2 Requires(post): systemd @@ -198,7 +208,8 @@ Utilities for the Koji system %package web Summary: Koji Web UI -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 Requires: %{name} = %{version}-%{release} Requires: %{name}-web-code = %{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 7 @@ -210,7 +221,8 @@ koji-web is a web UI to the Koji system. %package -n python%{python3_pkgversion}-%{name}-web Summary: Koji Web UI -License: LGPLv2 +# Automatically converted from old format: LGPLv2 - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2 %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}-web} Requires: httpd Requires: python%{python3_pkgversion}-mod_wsgi @@ -379,6 +391,9 @@ done %systemd_postun kojira.service %changelog +* Mon Sep 02 2024 Miroslav Suchý - 1.34.1-6 +- convert license to SPDX + * Mon Aug 26 2024 Adam Williamson - 1.34.1-5 - Backport PR #4184 to support overriding version and releasever for Kiwi