!7 [sync] PR-5: [合规提升]spec文件的License声明有歧义

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-20 06:29:37 +00:00 committed by Gitee
commit cbae1ec5bb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -4,9 +4,9 @@
%global oname jboss-jstl-api_1.2_spec
Name: jboss-jstl-1.2-api
Version: 1.1.4
Release: 1
Release: 2
Summary: JSP Standard Template Library 1.2 API
License: ASL 2.0 and (CDDL or GPLv2 with exceptions)
License: ASL 2.0 and (CDDL-1.1 or GPLv2 with exceptions)
URL: https://github.com/jboss/jboss-jstl-api_spec
Source0: https://github.com/jboss/jboss-jstl-api_spec/archive/%{oname}-%{namedversion}.tar.gz
BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.felix:maven-bundle-plugin)
@ -44,6 +44,9 @@ This package contains the API documentation for %{name}.
%license LICENSE README
%changelog
* Thu Jun 30 2022 Chenyx <chenyixiong3@huawei.com> - 1.1.4-2
- License compliance rectification
* Thu May 26 2022 houyingchao <houyingchao@huawei.com> - 1.1.4-1
- Upgrade to 1.1.4 version