!4 [合规提升]spec文件的License声明有歧义

From: @YixiongChen 
Reviewed-by: @jingxiaolu 
Signed-off-by: @jingxiaolu
This commit is contained in:
openeuler-ci-bot 2022-08-08 09:31:43 +00:00 committed by Gitee
commit 7d57cdfb8e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -2,9 +2,9 @@
%global namedversion %{version}%{?namedreltag}
Name: jboss-servlet-3.1-api
Version: 1.0.2
Release: 1
Release: 2
Summary: Java Servlet 3.1 API
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
License: (CDDL-1.0 or GPLv2 with exceptions) and ASL 2.0
Url: http://www.jboss.org
Source0: https://github.com/jboss/jboss-servlet-api_spec/archive/jboss-servlet-api_3.1_spec-%{namedversion}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
@ -39,6 +39,9 @@ cp %{SOURCE2} .
%license LICENSE cddl.txt LICENSE-2.0.txt
%changelog
* Thu Jun 30 2022 Chenyx <chenyixiong3@huawei.com> - 1.0.2-2
- License compliance rectification
* Thu May 26 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 1.0.2-1
- Update to 1.0.2