From 666550f9c95f765d986d991ad44d9299fe7ea054 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Aug 2019 18:35:36 +0200
Subject: [PATCH] Adapted 3.0 to epel

---
 fixDoclint.patch             | 19 +++++++++++++++++++
 java-runtime-decompiler.spec | 11 ++++++++---
 remove_rsyntaxtextarea.patch | 35 +++++++++++++++++++++++++++++------
 3 files changed, 56 insertions(+), 9 deletions(-)
 create mode 100644 fixDoclint.patch

diff --git a/fixDoclint.patch b/fixDoclint.patch
new file mode 100644
index 0000000..bdd46dc
--- /dev/null
+++ b/fixDoclint.patch
@@ -0,0 +1,19 @@
+diff --git a/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/MainFrameView.java b/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/MainFrameView.java
+index 86f9a87..18dce1a 100644
+--- a/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/MainFrameView.java
++++ b/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/MainFrameView.java
+@@ -174,11 +174,11 @@ public class MainFrameView {
+         welcomeJTextArea = new JTextArea(9, 40);
+         welcomeJTextArea.setText("Welcome to Java-Runtime-Decompiler\n" +
+                 "\n" +
+-                "Before using the app, the Decompiler Agent's path needs to be selected in 'Configure → Decompiler Agent'.\n" +
++                "Before using the app, the Decompiler Agent's path needs to be selected in 'Configure -> Decompiler Agent'.\n" +
+                 "It's a built-in project and can usually be found at '"+ ((isPortable())?"./libs/":"./decompiler_agent/target/") +"decompiler-agent-*.jar'.\n" +
+                 "\n" +
+                 "Internal javap decompiling tools are available by default.\n" +
+-                "You can also download an external decompiler, e.g. via 'mvn clean install -PdownloadPlugins', and set it up in 'Configure → Plugins'.\n" +
++                "You can also download an external decompiler, e.g. via 'mvn clean install -PdownloadPlugins', and set it up in 'Configure -> Plugins'.\n" +
+                 "Currently supported decompilers are: Fernflower, Procyon.\n");
+         welcomeJTextArea.setFont(new Font(welcomeJTextArea.getFont().getFontName(), welcomeJTextArea.getFont().getStyle(), 20));
+         welcomeJTextArea.setLineWrap(true);
+
diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec
index 57a836a..8be33f7 100644
--- a/java-runtime-decompiler.spec
+++ b/java-runtime-decompiler.spec
@@ -11,11 +11,15 @@ Source3: jrd.desktop
 Patch0: remove_rsyntaxtextarea.patch
 Patch1: systemFernflower.patch
 Patch2: systemProcyon.patch
+Patch3: fixDoclint.patch
 BuildArch: noarch
 BuildRequires: maven-local
 BuildRequires: byteman
-# RHEL does not have this package
-# BuildRequires: rsyntaxtextarea
+BuildRequires: junit
+BuildRequires: ant-junit
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire
+BuildRequires: maven-surefire-plugin
 # depends on devel, not runtime (needs tools.jar)
 BuildRequires: java-devel = 1:1.8.0
 BuildRequires: google-gson
@@ -39,6 +43,7 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 %patch1
 %patch2
+%patch3 -p1
 
 %build
 pushd runtime-decompiler
@@ -47,7 +52,7 @@ pushd runtime-decompiler
 %pom_remove_plugin :maven-jar-plugin
 popd
 export JAVA_TOOL_OPTIONS="-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none"
-%mvn_build 
+%mvn_build -f
 
 %install
 %mvn_install
diff --git a/remove_rsyntaxtextarea.patch b/remove_rsyntaxtextarea.patch
index 66d7af1..a68d62c 100644
--- a/remove_rsyntaxtextarea.patch
+++ b/remove_rsyntaxtextarea.patch
@@ -2,20 +2,43 @@ diff --git a/runtime-decompiler/pom.xml b/runtime-decompiler/pom.xml
 index 26a416e..e6e2425 100644
 --- a/runtime-decompiler/pom.xml
 +++ b/runtime-decompiler/pom.xml
-@@ -100,11 +100,11 @@
+@@ -131,11 +131,6 @@
              <scope>system</scope>
              <systemPath>${java.home}/../lib/tools.jar</systemPath>
          </dependency>
 -        <dependency>
-+<!--        <dependency>
-             <groupId>com.fifesoft</groupId>
-             <artifactId>rsyntaxtextarea</artifactId>
-             <version>2.6.1</version>
+-            <groupId>com.fifesoft</groupId>
+-            <artifactId>rsyntaxtextarea</artifactId>
+-            <version>2.6.1</version>
 -        </dependency>
-+        </dependency>-->
          <dependency>
              <groupId>org.jboss.byteman</groupId>
              <artifactId>byteman-install</artifactId>
+@@ -144,24 +139,6 @@
+         </dependency>
+ 
+         <!-- For tests -->
+-        <dependency>
+-            <groupId>org.junit.jupiter</groupId>
+-            <artifactId>junit-jupiter-api</artifactId>
+-            <version>5.5.0</version>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.junit.jupiter</groupId>
+-            <artifactId>junit-jupiter-params</artifactId>
+-            <version>5.5.0</version>
+-            <scope>test</scope>
+-        </dependency>
+-        <dependency>
+-            <groupId>org.junit.jupiter</groupId>
+-            <artifactId>junit-jupiter-engine</artifactId>
+-            <version>5.5.0</version>
+-            <scope>test</scope>
+-        </dependency>
+ 
+     </dependencies>
+ 
 diff --git a/runtime-decompiler/src/main/java/org/jrd/frontend/BytecodeDecompilerView.java b/runtime-decompiler/src/main/java/org/jrd/frontend/BytecodeDecompilerView.java
 index 9c19e2c..8d17775 100644
 --- a/runtime-decompiler/src/main/java/org/jrd/frontend/MainFrame/BytecodeDecompilerView.java