From c96af978b40746de28693878c28adae99ce4f589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Oct 2023 21:00:00 +0000 Subject: [PATCH] Migrate to SPDX license This follows https://github.com/rpm-software-management/rpm/issues/2511 and moves the license string to only one place. No need to repeat it in subpackages. I did not include a changelog entry as there are five other PR waiting in a queue, and that would conflict with them. --- rpm.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/rpm.spec b/rpm.spec index d6ad76c..c2226b5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -38,6 +38,7 @@ Name: rpm Version: %{rpmver} Release: %{?snapver:0.%{snapver}.}%{baserelease}%{?dist} Url: http://www.rpm.org/ +License: GPL-2.0-or-later Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2 Source10: rpmdb-rebuild.service @@ -45,10 +46,6 @@ Source10: rpmdb-rebuild.service Source20: rpmdb-migrate.service Source21: rpmdb_migrate -# Partially GPL/LGPL dual-licensed and some bits with BSD -# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD -License: GPLv2+ - Requires: coreutils Requires: popt%{_isa} >= 1.10.2.1 Requires: curl @@ -153,7 +150,7 @@ the package like its version, a description, etc. %package libs Summary: Libraries for manipulating RPM packages -License: GPLv2+ and LGPLv2+ with exceptions +License: GPL-2.0-or-later OR LGPL-2.1-or-later Requires(meta): %{name} = %{version}-%{release} %if %{with sequoia} # >= 1.4.0 required for pgpVerifySignature2() and pgpPrtParams2() @@ -165,7 +162,6 @@ This package contains the RPM shared libraries. %package build-libs Summary: Libraries for building RPM packages -License: GPLv2+ and LGPLv2+ with exceptions Requires: rpm-libs%{_isa} = %{version}-%{release} %description build-libs @@ -173,7 +169,6 @@ This package contains the RPM shared libraries for building packages. %package sign-libs Summary: Libraries for signing RPM packages -License: GPLv2+ and LGPLv2+ with exceptions Requires: rpm-libs%{_isa} = %{version}-%{release} Requires: %{_bindir}/gpg2 @@ -182,7 +177,7 @@ This package contains the RPM shared libraries for signing packages. %package devel Summary: Development files for manipulating RPM packages -License: GPLv2+ and LGPLv2+ with exceptions +License: GPL-2.0-or-later OR LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Requires: %{name}-libs%{_isa} = %{version}-%{release} Requires: %{name}-build-libs%{_isa} = %{version}-%{release}