Compare commits
11 Commits
b4831f7df3
...
62c9ef175b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
62c9ef175b | ||
|
|
fd23c060bd | ||
|
|
a518800bd2 | ||
|
|
b5fe98122d | ||
|
|
9e717f7a49 | ||
|
|
e53cc7b9a5 | ||
|
|
29beb37487 | ||
|
|
5769251bc7 | ||
|
|
8fe9432c35 | ||
|
|
45e8addaae | ||
|
|
c2cf1758e7 |
27
backport-migrate-to-SPDX-license-format.patch
Normal file
27
backport-migrate-to-SPDX-license-format.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From aad1d50e6c3f9eea5719fae0abf042297f02cbc0 Mon Sep 17 00:00:00 2001
|
||||
From: lizhuo <lizhuo@xfusion.com>
|
||||
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
|
||||
Binary file not shown.
BIN
nss-pem-1.1.0.tar.xz
Normal file
BIN
nss-pem-1.1.0.tar.xz
Normal file
Binary file not shown.
31
nss-pem.spec
31
nss-pem.spec
@ -1,12 +1,14 @@
|
||||
Name: nss-pem
|
||||
Version: 1.0.6
|
||||
Release: 1
|
||||
Version: 1.1.0
|
||||
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
|
||||
|
||||
BuildRequires: cmake gcc nss-pkcs11-devel git
|
||||
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}
|
||||
Obsoletes: %{name} < %{version}-%{release}
|
||||
@ -16,9 +18,10 @@ PEM file reader for Network Security Services (NSS), implemented as a PKCS#11
|
||||
module.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1 -Sgit
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags} -DNSS_PKCS11_2_0_COMPAT"
|
||||
mkdir build
|
||||
pushd build
|
||||
%cmake ../src
|
||||
@ -37,9 +40,27 @@ popd
|
||||
|
||||
%files
|
||||
%{_libdir}/libnsspem.so
|
||||
%license COPYING
|
||||
%license COPYING.{GPL,MPL}
|
||||
|
||||
%changelog
|
||||
* Fri Apr 18 2025 lizhuo <lizhuo@xfusion.com> - 1.1.0-2
|
||||
- migrate to SPDX license format
|
||||
|
||||
* Fri Jul 14 2023 niuyaru <niuyaru@kylinos.cn> - 1.1.0-1
|
||||
- update version to 1.1.0
|
||||
|
||||
* Fri Dec 31 2021 panxiaohe <panxiaohe@huawei.com> - 1.0.8-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update version to 1.0.8
|
||||
|
||||
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.0.6-3
|
||||
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
||||
|
||||
* Fri Aug 7 2020 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 1.0.6-2
|
||||
- Add -DNSS_PKCS11_2_0_COMPAT to solve build failure
|
||||
|
||||
* Tue Jul 28 2020 yang_zhuang_zhuang <yangzhuangzhuang1@huawei.com> - 1.0.6-1
|
||||
- update version to 1.0.6
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user