From 81941f2d2bfe0285b6fb76a4529012688edc7f3c Mon Sep 17 00:00:00 2001
From: caodongxia <315816521@qq.com>
Date: Tue, 6 Sep 2022 11:39:24 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!3=20:?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0confilicts=E5=86=B2=E7=AA=81=E9=99=90?=
 =?UTF-8?q?=E5=88=B6'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 glassfish-jsp.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 5f61b48..2d56eef 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:             1
 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,8 +70,5 @@ popd
 %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
 
 %changelog
-* Tue Aug 30 2022 Ge Wang <wangge20@h-partners.com> 2.3.3-2
-- Add conflicts limits
-
 * Sat Aug 1 2020 shaoqiang kang <kangshaoqiang1@huawei.com> - 2.3.3-1
 - Package init
-- 
Gitee