diff --git a/jakarta-servlet.spec b/jakarta-servlet.spec index 466bc8e..3013277 100644 --- a/jakarta-servlet.spec +++ b/jakarta-servlet.spec @@ -2,7 +2,7 @@ Name: jakarta-servlet Version: 5.0.0 -Release: 1 +Release: 2 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 @@ -19,6 +19,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %endif Provides: glassfish-servlet-api = %{version}-%{release} +Conflicts: glassfish-servlet-api < %{version}-%{release} %description Jakarta Servlet defines a server-side API for handling HTTP requests @@ -63,5 +64,8 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java) %doc README.md %changelog +* Thu Nov 2 2023 liyanan - 5.0.0-2 +- Add Confilict glassfish-servlet-api due to provides same file glassfish-servlet-api.jar + * Thu Dec 23 2021 houyingchao - 5.0.0-1 - Initial package