diff --git a/jakarta-servlet.spec b/jakarta-servlet.spec index 466bc8ea2ccae8e354410b3a11b341402d5471bb..d6a82b437fcf818cdbff1508018cb3ad3e7b6140 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 @@ -17,8 +17,7 @@ BuildRequires: javapackages-bootstrap BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %endif - -Provides: glassfish-servlet-api = %{version}-%{release} +Requires: glassfish-servlet-api %description 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:servlet-api -%mvn_file :{*} %{name}/@1 glassfish-servlet-api - %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 %changelog +* Thu May 12 2022 konglidong - 5.0.0-2 +- Fix install confilict with glassfish-servlet-api + * Thu Dec 23 2021 houyingchao - 5.0.0-1 - Initial package