From 6793609282ffc4744bf527291d2b9dcacb64ebe9 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 6 Sep 2022 20:14:06 +0800 Subject: [PATCH] Revert conflicts limits --- glassfish-jsp.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec index 5f61b48..6250cab 100644 --- a/glassfish-jsp.spec +++ b/glassfish-jsp.spec @@ -3,7 +3,7 @@ %global reltag b02 Name: glassfish-jsp Version: 2.3.3 -Release: 2 +Release: 3 Summary: Glassfish J2EE JSP API implementation License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0 URL: http://glassfish.org @@ -23,7 +23,6 @@ Provides: jsp = %{jspspec} Provides: jsp%{jspspec} Provides: javax.servlet.jsp Requires: glassfish-jsp-api -Conflicts: glassfish-jsp >= 2.3.6 %description This project provides a container independent implementation of JSP 2.3. The main goals are: @@ -71,7 +70,10 @@ popd %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html %changelog -* Tue Aug 30 2022 Ge Wang 2.3.3-2 +* Tue Sep 06 2022 yaoxin - 2.3.3-3 +- Revert conflicts limits + +* Tue Aug 30 2022 Ge Wang - 2.3.3-2 - Add conflicts limits * Sat Aug 1 2020 shaoqiang kang - 2.3.3-1 -- Gitee