!20 同步master分支添加与glassfish-servlet-api的冲突，并提供glassfish-servlet-api

From: @wk333 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

jakarta-servlet.spec

@@ -2,7 +2,7 @@
 
 Name:           jakarta-servlet
 Version:        5.0.0
-Release:        3
+Release:        4
 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-4
+- Add Confilict glassfish-servlet-api due to provides same file glassfish-servlet-api.jar
+
 * Wed Nov 16 2022 wangkai <wangkai385@h-partners.com> - 5.0.0-3
 - Change source