!19 [sync] PR-18: 添加Confilict glassfish-servlet-api修复提供相同的glassfish-servlet-api.jar文件

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-02-28 07:45:19 +00:00 committed by Gitee
commit 8c5aa0fd74
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -2,7 +2,7 @@
Name: jakarta-servlet
Version: 5.0.0
Release: 2
Release: 3
Summary: Server-side API for handling HTTP requests and responses
License: (EPL-2.0 or GPLv2 with exceptions) and ASL 2.0
URL: https://github.com/eclipse-ee4j/servlet-api
@ -17,7 +17,8 @@ BuildRequires: javapackages-bootstrap
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
%endif
Requires: glassfish-servlet-api
provides: glassfish-servlet-api = %{version}-%{release}
Conflicts: glassfish-servlet-api < %{version}-%{release}
%description
Jakarta Servlet defines a server-side API for handling HTTP requests
@ -49,6 +50,8 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
javax.servlet:javax.servlet-api \
javax.servlet:servlet-api
%mvn_file :{*} %{name}/@1 glassfish-servlet-api
%build
%mvn_build
@ -60,6 +63,9 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
%doc README.md
%changelog
* Tue Feb 28 2023 xu_ping <xuping33@h-partners.com> - 5.0.0-3
- Add Confilict glassfish-servlet-api due to provides same file glassfish-servlet-api.jar
* Sat Feb 12 2022 Ge Wang <wangge20@huawei.com> - 5.0.0-2
- Fix install confilict with glassfish-servlet-api due to provides same file glassfish-servlet-api.jar