From a3f2d8565884f8629e0fb0462a244450baf7337c Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 26 Jan 2023 10:25:17 +0100 Subject: [PATCH] update license info Change of licences of ongres-scram and ongres-scram-javadoc to "BSD and MIT and ASL 2.0" Include all license and notice files in the rpm. Resolves: #2164712 --- ongres-scram.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ongres-scram.spec b/ongres-scram.spec index 4e943b9..07745a3 100644 --- a/ongres-scram.spec +++ b/ongres-scram.spec @@ -3,9 +3,9 @@ Name: ongres-%upstream_name Version: %(echo %upstream_version | sed 's/-/~/g') -Release: 8%{?dist} +Release: 9%{?dist} Summary: Salted Challenge Response Authentication Mechanism (SCRAM) - Java Implementation -License: BSD +License: BSD and MIT and ASL 2.0 URL: https://github.com/ongres/%upstream_name Source0: https://github.com/ongres/%upstream_name/archive/%upstream_version/%upstream_name-%upstream_version.tar.gz BuildRequires: maven-local @@ -22,6 +22,7 @@ mechanisms. It is described as part of RFC 5802 and RFC7677. %package client Summary: Client for %{name} +License: BSD %description client This package contains the client for %{name} @@ -34,6 +35,7 @@ This package contains javadoc for %{name} %package parent Summary: Parent POM of %{name} +License: BSD %description parent This package contains the %{name} parent POM. @@ -57,7 +59,7 @@ sed -i 's/.*SuppressFBWarnings.*//' common/src/main/java/com/ongres/scram/common %mvn_install %files -f .mfiles-common -%license LICENSE +%license LICENSE NOTICE thirdparty/bouncycastle-LICENSE thirdparty/saslprep-LICENSE thirdparty/passlib_lambda-LICENSE %files client -f .mfiles-client %license LICENSE @@ -69,6 +71,9 @@ sed -i 's/.*SuppressFBWarnings.*//' common/src/main/java/com/ongres/scram/common %license LICENSE %changelog +* Thu Jan 26 2023 Zuzana Miklankova - 2.1-9 +- change of licences of ongres-scram and ongres-scram-javadoc to "BSD and MIT and ASL 2.0" + * Thu Jan 19 2023 Fedora Release Engineering - 2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild