From 8050c799cdcad0be6f7af9702d1dc113f73ae357 Mon Sep 17 00:00:00 2001 From: wu-leilei Date: Wed, 10 Aug 2022 10:51:38 +0800 Subject: [PATCH] fix install conflicts between glassfish-servlet-api and jakarta-servlet --- jakarta-servlet.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jakarta-servlet.spec b/jakarta-servlet.spec index 86aafcb..29c4a8b 100644 --- a/jakarta-servlet.spec +++ b/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 @@ -19,7 +19,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %endif Provides: glassfish-servlet-api = %{version}-%{release} -Obsoletes: glassfish-servlet-api < %{version}-%{release} +Conflicts: glassfish-servlet-api < %{version}-%{release} %description Jakarta Servlet defines a server-side API for handling HTTP requests @@ -64,6 +64,9 @@ sed -i -e 's/jakarta\./javax./g' $(find api/src/main/java/javax -name *.java) %doc README.md %changelog +* Wed Aug 10 2022 - 5.0.0-4 +- Fix install conflicts between glassfish-servlet-api and jakarta-servlet + * Wed Aug 03 2022 - 5.0.0-3 - Fix install conflicts between glassfish-servlet-api and jakarta-servlet -- Gitee