diff --git a/backport-migrate-to-SPDX-license-format.patch b/backport-migrate-to-SPDX-license-format.patch new file mode 100644 index 0000000..9ad82bc --- /dev/null +++ b/backport-migrate-to-SPDX-license-format.patch @@ -0,0 +1,27 @@ +From aad1d50e6c3f9eea5719fae0abf042297f02cbc0 Mon Sep 17 00:00:00 2001 +From: lizhuo +Date: Fri, 18 Apr 2025 16:22:42 +0800 +Subject: [PATCH] migrate-to-SPDX-license-format + +--- + make-srpm.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/make-srpm.sh b/make-srpm.sh +index 760f8e5..7d35f6f 100755 +--- a/make-srpm.sh ++++ b/make-srpm.sh +@@ -91,7 +91,10 @@ Version: $VER + Release: 1%{?dist} + Summary: PEM file reader for Network Security Services (NSS) + +-License: MPLv1.1 ++# See README for details ++# list.h - GPL-2.0-only ++# * - MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later ++License: GPL-2.0-only AND (MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later) + URL: https://github.com/kdudka/nss-pem + Source0: https://github.com/kdudka/nss-pem/releases/download/$NV/$SRC + +-- +2.33.0 \ No newline at end of file diff --git a/nss-pem.spec b/nss-pem.spec index 718b5bf..e1cc993 100644 --- a/nss-pem.spec +++ b/nss-pem.spec @@ -1,11 +1,13 @@ Name: nss-pem Version: 1.1.0 -Release: 1 +Release: 2 Summary: PEM file reader for Network Security Services (NSS) License: MPLv1.1 URL: https://github.com/kdudka/nss-pem Source0: https://github.com/kdudka/nss-pem/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz +Patch0001: backport-migrate-to-SPDX-license-format.patch + BuildRequires: cmake gcc nss-pkcs11-devel Requires: nss%{?_isa} >= %(nss-config --version 2>/dev/null || echo 0) Conflicts: nss%{?_isa} < 3.24.0-3%{?dist} @@ -41,6 +43,9 @@ popd %license COPYING.{GPL,MPL} %changelog +* Fri Apr 18 2025 lizhuo - 1.1.0-2 +- migrate to SPDX license format + * Fri Jul 14 2023 niuyaru - 1.1.0-1 - update version to 1.1.0