From f8077b3dbec209d2d445baf9c6db1e183e60f7d2 Mon Sep 17 00:00:00 2001
From: Dingli Zhang <dingli@iscas.ac.cn>
Date: Thu, 11 Apr 2024 22:49:04 +0800
Subject: [PATCH] Update to OpenJDK-11 and fix LenientDateTimeFieldTest

(cherry picked from commit 2eedd48dc60441234d3ba2a1d5495017d6beb050)
---
 apache-mime4j.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apache-mime4j.spec b/apache-mime4j.spec
index b2b84f4..979cc90 100644
--- a/apache-mime4j.spec
+++ b/apache-mime4j.spec
@@ -1,6 +1,6 @@
 Name:                apache-mime4j
 Version:             0.8.7
-Release:             3
+Release:             4
 Summary:             Apache JAMES Mime4j
 License:             Apache-2.0
 URL:                 http://james.apache.org/mime4j
@@ -13,6 +13,9 @@ BuildRequires:       mvn(org.apache:apache:pom:) mvn(org.apache.felix:maven-bund
 BuildRequires:       mvn(org.assertj:assertj-core) mvn(org.codehaus.mojo:javacc-maven-plugin)
 BuildRequires:       mvn(org.mockito:mockito-core) mvn(org.slf4j:slf4j-api)
 BuildRequires:       mvn(com.google.guava:guava)
+BuildRequires:       java-11-openjdk-devel
+Requires:            java-11-openjdk
+Requires:            javapackages-tools
 BuildArch:           noarch
 %description
 Java stream based MIME message parser.
@@ -27,20 +30,14 @@ API documentation for %{name}.
 %pom_remove_plugin :apache-rat-plugin
 %pom_remove_plugin :maven-jar-plugin
 %pom_disable_module assemble
-sed -i 's/Date: Thu, 4 Oct 2001 20:12:26 -0700 (PDT),Thu, 4 Oct 2001 20:12:26 -0700/Date: Fri, 5 Oct 2001 03:12:26 -0700 (PDT),Fri, 5 Oct 2001 03:12:26 -0700/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
-sed -i 's/Date: Wed, 16 Jul 2008 17:12:33 +0200 (PDT)/Date: Wed, 16 Jul 2008 15:12:33 +0200 (PDT)/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
-sed -i 's/Date: Wed, 16 Jul 08 17:12:33 +0200/Date: Wed, 16 Jul 08 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
-sed -i 's/Date: Wed, 16 Jul 2008 17:12:33 +0200/Date: Wed, 16 Jul 2008 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
-sed -i 's/Date: 16 Jul 2008 17:12:33 +0200/Date: 16 Jul 2008 15:12:33 +0200/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
-sed -i 's/1175052759000L/1175088759000L/g' dom/src/test/java/org/apache/james/mime4j/field/LenientDateTimeFieldTest.java
 for p in core dom storage; do
   %mvn_file :*$p %{name}/%{name}-$p %{name}/$p
 done
 
 %build
-%ifarch riscv64
-export JAVA_TOOL_OPTIONS="-Xmx4096m"
-%endif
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
+export CFLAGS="${RPM_OPT_FLAGS}"
+export CXXFLAGS="${RPM_OPT_FLAGS}"
 %mvn_build
 
 %install
@@ -54,6 +51,9 @@ export JAVA_TOOL_OPTIONS="-Xmx4096m"
 %license LICENSE NOTICE
 
 %changelog
+* Thu Apr 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 0.8.7-4
+- Update to OpenJDK-11 and fix LenientDateTimeFieldTest
+
 * Thu Feb 29 2024 yaoxin <yao_xin001@hoperun.com> - 0.8.7-3
 - Fix CVE-2024-21742
 
-- 
Gitee