Merge branch 'epel9' into epel8

Most likely many deps missing. Will be added later

2b99a244b592445962cdd15ca33f80449f9aa2ea.patch

@@ -0,0 +1,60 @@
+commit 2b99a244b592445962cdd15ca33f80449f9aa2ea
+Author: Jiri <jvanek@redhat.com>
+Date:   Tue Jul 11 10:16:41 2023 +0200
+
+    isTreatAllTabsAsOneBatch returns false in jrd mode and is not shown
+
+diff --git a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java b/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java
+index 3e87e6d..a8db71a 100644
+--- a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java
++++ b/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java
+@@ -574,18 +574,20 @@ public class TextWithControls extends JPanel
+             }
+         });
+         advanced.add(setMethod);
+-        JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch");
+-        Container parent = getParentWindow();
+-        if (parent != null) {
+-            treatAllAsOne.addActionListener(new ActionListener() {
+-                @Override
+-                public void actionPerformed(ActionEvent actionEvent) {
+-                    setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected());
+-                    repaintMenu(menu);
+-                }
+-            });
+-            treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch());
+-            advanced.add(treatAllAsOne);
++        if (getParentWindow()!=null) {
++            JCheckBox treatAllAsOne = new JCheckBox("Treat all tabs in this window as single batch");
++            Container parent = getParentWindow();
++            if (parent != null) {
++                treatAllAsOne.addActionListener(new ActionListener() {
++                    @Override
++                    public void actionPerformed(ActionEvent actionEvent) {
++                        setTreatAllTabsAsOneBatch(treatAllAsOne.isSelected());
++                        repaintMenu(menu);
++                    }
++                });
++                treatAllAsOne.setSelected(isTreatAllTabsAsOneBatch());
++                advanced.add(treatAllAsOne);
++            }
+         }
+         if (hasVm(classesAndMethodsProvider)) {
+             JCheckBox addToBoot = new JCheckBox(
+@@ -908,10 +910,16 @@ public class TextWithControls extends JPanel
+     }
+ 
+     private void setTreatAllTabsAsOneBatch(boolean selected) {
++        if (getParentWindow() == null) {
++            return ;
++        }
+         getParentWindow().setTreatAllTabsAsOneBatch(selected);
+     }
+ 
+     private boolean isTreatAllTabsAsOneBatch() {
++        if (getParentWindow() == null) {
++            return false;
++        }
+         return getParentWindow().isTreatAllTabsAsOneBatch();
+     }
+ 

java-runtime-decompiler

@@ -2,6 +2,12 @@
 
 # java runtime decompiler launch script
 
+# unless java_home is set, select jdk17
+# this must be before sourcing java-functions
+if [ "x$JAVA_HOME" == "x" ] ; then
+  export JAVA_HOME=/usr/lib/jvm/jre-17-openjdk
+fi
+
 # JPackage Project <http://www.jpackage.org/>
 # Source functions library
 

java-runtime-decompiler.spec

@@ -28,27 +28,26 @@ ExclusiveArch:  %{java_arches} noarch
 BuildRequires: maven-local
 BuildRequires: byteman
 BuildRequires: rsyntaxtextarea
-BuildRequires: junit5
+#BuildRequires: junit5
-BuildRequires: ant-junit5
+#BuildRequires: ant-junit5
 BuildRequires: junit
 BuildRequires: ant-junit
 BuildRequires: java-diff-utils
 BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-provider-junit5
+#BuildRequires: maven-surefire-provider-junit5
 BuildRequires: maven-surefire
 BuildRequires: maven-surefire-plugin
-BuildRequires: maven-clean-plugin
+BuildRequires: java-11-devel
-BuildRequires: java-devel
 BuildRequires: google-gson
 BuildRequires: desktop-file-utils
 BuildRequires: classpathless-compiler
 Requires: google-gson
 Requires: byteman
 Requires: rsyntaxtextarea
-Requires: java-headless
+Requires: java-17-openjdk-headless
 Requires: classpathless-compiler
 Requires: java-diff-utils
-Recommends: java
+Recommends: java-17-openjdk
 Recommends: %{name}-fernflower-plugin
 Recommends: %{name}-procyon-plugin
 Recommends: %{name}-cfr-plugin
@@ -139,7 +138,7 @@ for x in $a ; do
 done
 xmvn --version
 echo $JAVA_HOME
-export JAVA_HOME=/usr/lib/jvm/java-17-openjdk #why?
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk #why?
 xmvn --version
 %mvn_build -f --xmvn-javadoc -- -Plegacy
 CPLC=/usr/share/java/classpathless-compiler
@@ -240,6 +239,9 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
+* Tue Jul 11 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.3-3
+- strictly needing jdk17 unless user says differently
+
 * Tue Jul 11 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.3-2
 - added 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch to fix compiler issue in jrd window