From 92bc6aaad61f4611614c52a852bf1a6d1ab6c238 Mon Sep 17 00:00:00 2001
From: desert-sailor <dxwangk@isoftstone.com>
Date: Tue, 18 Apr 2023 16:31:25 +0800
Subject: [PATCH] Update jakarta-el to 4.0.0

---
 ...rta-el.patch => freemarker-2.3.31-use-jakarta-el.patch | 2 +-
 freemarker.spec                                           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename freemarker-2.3.30-use-jakarta-el.patch => freemarker-2.3.31-use-jakarta-el.patch (87%)

diff --git a/freemarker-2.3.30-use-jakarta-el.patch b/freemarker-2.3.31-use-jakarta-el.patch
similarity index 87%
rename from freemarker-2.3.30-use-jakarta-el.patch
rename to freemarker-2.3.31-use-jakarta-el.patch
index ffdeb12..3311d58 100644
--- a/freemarker-2.3.30-use-jakarta-el.patch
+++ b/freemarker-2.3.31-use-jakarta-el.patch
@@ -7,7 +7,7 @@ index 0b03c2b..e880d34 100644
      <dependency org="javax.servlet" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
      <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
 -    
-+    <dependency org="jakarta.el" name="jakarta.el-api" rev="3.0.3" />
++    <dependency org="jakarta.el" name="jakarta.el-api" rev="4.0.0" />
 +
      <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
  
diff --git a/freemarker.spec b/freemarker.spec
index 1a18a6c..b89735c 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -2,7 +2,7 @@
 
 Name:                freemarker
 Version:             2.3.31
-Release:             1
+Release:             2
 Summary:             The Apache FreeMarker Template Engine
 License:             ASL 2.0
 URL:                 https://freemarker.apache.org/
@@ -13,13 +13,14 @@ Patch3:              fix-javadoc-encoding.patch
 Patch5:              no-javarebel.patch
 Patch6:              enable-jdom.patch
 Patch7:              javacc-7.patch
-Patch8:              freemarker-2.3.30-use-jakarta-el.patch
+Patch8:              freemarker-2.3.31-use-jakarta-el.patch
 
 BuildArch:           noarch
 BuildRequires:       java-1.8.0-openjdk-devel ant apache-parent apache-commons-logging aqute-bnd hamcrest
 BuildRequires:       ivy-local glassfish-jsp-api glassfish-servlet-api javacc >= 7.0 jaxen >= 1.1
 BuildRequires:       jcl-over-slf4j jdom >= 1.0 junit log4j-over-slf4j slf4j
 BuildRequires:       xalan-j2 >= 2.7.0
+BuildRequires:       jakarta-el >= 4.0.0
 
 %if %{without jp_minimal}
 BuildRequires:       dom4j
@@ -90,6 +91,9 @@ export LANG=C.UTF-8
 %license LICENSE NOTICE
 
 %changelog
+* Tue Apr 18 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.3.31-2
+- Update jakarta-el to 4.0.0
+
 * Wed Jun 01 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 2.3.31-1
 - Update to 2.3.31