summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-11-04 09:53:02 +0100
committerRemi Collet <remi@php.net>2022-11-04 09:53:02 +0100
commit5ee7f90484d55caf2f13072b701b35498322da09 (patch)
tree9b90516232a54ab30c330c58ac62b6bdb59d32d8
parent2e8ddcff90582a97f7d427e799ae5ad706ae54b9 (diff)
add upstream fix to clarify license and abandoned patent
-rw-r--r--rnp.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/rnp.spec b/rnp.spec
index 06c0e12..df8f914 100644
--- a/rnp.spec
+++ b/rnp.spec
@@ -24,8 +24,8 @@
Name: rnp
Summary: OpenPGP (RFC4880) tools
Version: 0.16.2
-Release: 3%{?dist}
-# See rnp-files-by-license.txt
+Release: 4%{?dist}
+# See rnp-files-by-license.txt and upstream LICENSE* files
License: BSD-2-Clause AND BSD-3-Clause AND Apache-2.0 AND MIT
URL: https://github.com/rnpgp/rnp
@@ -36,6 +36,9 @@ Source2: %{name}-keyring.gpg
# Use --with licensecheck to generate
Source3: %{name}-files-by-license.txt
+# License clarification
+Patch0: %{name}-upstream.patch
+
BuildRequires: cmake >= 3.14
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -84,6 +87,7 @@ for %{libname}.
%prep
%setup -q
%{?gpgverify:%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'}
+%patch0 -p1
%if %{with licensecheck}
LST=$(mktemp)
@@ -140,6 +144,9 @@ rm $LST
%changelog
+* Fri Nov 4 2022 Remi Collet <remi@remirepo.net> - 0.16.2-4
+- add upstream fix to clarify license and abandoned patent
+
* Wed Nov 2 2022 Remi Collet <remi@remirepo.net> - 0.16.2-3
- add files by license list in package sources
- open https://github.com/rnpgp/rnp/issues/1932 missing MIT