fix instal conflict
(cherry picked from commit d3e8696bf91d9121591d85ec3c3df5bc9effd3f5)
This commit is contained in:
parent
a2233a0c9f
commit
5c5fb0c8d5
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: jakarta-servlet
|
Name: jakarta-servlet
|
||||||
Version: 5.0.0
|
Version: 5.0.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Server-side API for handling HTTP requests and responses
|
Summary: Server-side API for handling HTTP requests and responses
|
||||||
License: (EPL-2.0 or GPLv2 with exceptions) and ASL 2.0
|
License: (EPL-2.0 or GPLv2 with exceptions) and ASL 2.0
|
||||||
URL: https://github.com/eclipse-ee4j/servlet-api
|
URL: https://github.com/eclipse-ee4j/servlet-api
|
||||||
@ -17,8 +17,7 @@ BuildRequires: javapackages-bootstrap
|
|||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||||
%endif
|
%endif
|
||||||
|
Requires: glassfish-servlet-api
|
||||||
Provides: glassfish-servlet-api = %{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Jakarta Servlet defines a server-side API for handling HTTP requests
|
Jakarta Servlet defines a server-side API for handling HTTP requests
|
||||||
@ -50,8 +49,6 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
|
|||||||
javax.servlet:javax.servlet-api \
|
javax.servlet:javax.servlet-api \
|
||||||
javax.servlet:servlet-api
|
javax.servlet:servlet-api
|
||||||
|
|
||||||
%mvn_file :{*} %{name}/@1 glassfish-servlet-api
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build
|
%mvn_build
|
||||||
|
|
||||||
@ -63,5 +60,8 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java)
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
||||||
|
|
||||||
* Thu Dec 23 2021 houyingchao<houyingchao@huawei.com> - 5.0.0-1
|
* Thu Dec 23 2021 houyingchao<houyingchao@huawei.com> - 5.0.0-1
|
||||||
- Initial package
|
- Initial package
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user