From dd862afdfe47550329c2229157f0e5475c5740d0 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Wed, 21 Feb 2024 12:18:09 +0100
Subject: [PATCH 1/2] Set OpenJDK version to 1.8

---
 0002-Set-Java-source-target-to-1.8.patch | 25 ++++++++++++++++++++++++
 java_cup.spec                            | 11 +++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 0002-Set-Java-source-target-to-1.8.patch

diff --git a/0002-Set-Java-source-target-to-1.8.patch b/0002-Set-Java-source-target-to-1.8.patch
new file mode 100644
index 0000000..b62e62e
--- /dev/null
+++ b/0002-Set-Java-source-target-to-1.8.patch
@@ -0,0 +1,25 @@
+From 202fbfcbb7c179dcd40e7b296604febb10a8c256 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Wed, 21 Feb 2024 12:13:45 +0100
+Subject: [PATCH] Set Java source/target to 1.8
+
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index d5c2b54..cb1dfd1 100644
+--- a/build.xml
++++ b/build.xml
+@@ -57,7 +57,7 @@
+        token="+ version_str"
+        value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'>
+     </replace>
+-    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
++    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.8" target="1.8">
+       <classpath refid="libraries"/>
+     </javac>
+   </target>
+-- 
+2.43.0
+
diff --git a/java_cup.spec b/java_cup.spec
index 6a5fbc3..6198101 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -4,7 +4,7 @@
 
 Name:           java_cup
 Version:        0.11b
-Release:        27%{?dist}
+Release:        28%{?dist}
 Epoch:          1
 Summary:        LALR parser generator for Java
 License:        SMLNJ
@@ -20,6 +20,7 @@ Source2:        %{name}-MANIFEST.MF
 Source4:        %{name}-runtime-MANIFEST.MF
 
 Patch0:         %{name}-build.patch
+Patch1:         0002-Set-Java-source-target-to-1.8.patch
 
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
@@ -52,9 +53,8 @@ Documentation for java_cup.
 
 %prep
 %setup -q
-%patch0 -b .build
-
-sed -i '/<javac/s/1.5/1.7/g' build.xml
+%patch 0 -b .build
+%patch 1 -p1
 
 # remove all binary files
 find -name "*.class" -delete
@@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 %license licence.txt
 
 %changelog
+* Wed Feb 21 2024 Marian Koncek <mkoncek@redhat.com> - 1:0.11b-28
+- Set OpenJDK version to 1.8
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a8a512719de4e65c6167bd04ebb323d7304ce118 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 2 Mar 2024 18:14:54 +0100
Subject: [PATCH 2/2] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 java_cup.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java_cup.spec b/java_cup.spec
index 6198101..462eae4 100644
--- a/java_cup.spec
+++ b/java_cup.spec
@@ -4,7 +4,7 @@
 
 Name:           java_cup
 Version:        0.11b
-Release:        28%{?dist}
+Release:        29%{?dist}
 Epoch:          1
 Summary:        LALR parser generator for Java
 License:        SMLNJ
@@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 %license licence.txt
 
 %changelog
+* Sat Mar 02 2024 Jiri Vanek <jvanek@redhat.com> - 1:0.11b-29
+- Rebuilt for java-21-openjdk as system jdk
+
 * Wed Feb 21 2024 Marian Koncek <mkoncek@redhat.com> - 1:0.11b-28
 - Set OpenJDK version to 1.8