diff --git a/.gitignore b/.gitignore index 5c6e117..c37ccde 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ /java-runtime-decompiler-7.1.tar.gz /java-runtime-decompiler-7.2.tar.gz /java-runtime-decompiler-7.3.tar.gz +/java-runtime-decompiler-8.0.tar.gz +/java-runtime-decompiler-9.1.tar.gz diff --git a/java-runtime-decompiler.spec b/java-runtime-decompiler.spec index d02855a..dbc9e1b 100644 --- a/java-runtime-decompiler.spec +++ b/java-runtime-decompiler.spec @@ -1,10 +1,10 @@ Summary: Application for extraction and decompilation of JVM byte code Name: java-runtime-decompiler -Version: 7.3 -Release: 3%{?dist} +Version: 9.1 +Release: 1%{?dist} License: GPLv3 URL: https://github.com/pmikova/java-runtime-decompiler -Source0: https://github.com/pmikova/%{name}/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/judovana/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name} Source3: jrd.desktop Source4: jrd-hex.desktop @@ -22,7 +22,6 @@ Patch61: systemJcoder7.patch Patch62: systemJcoderG.patch Patch63: systemJcoderG7.patch Patch7: removeMultilineSpotbugs.patch -Patch8: 2b99a244b592445962cdd15ca33f80449f9aa2ea.patch BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -92,7 +91,7 @@ Requires: %{name} = %{version}-%{release} This package provides bindings and requirements to CFR decompiler for %{name}. %package asmtools-plugin -Requires: openjdk-asmtools >= 8.0.b02.ea-0.3.20230113 +Requires: openjdk-asmtools >= 8.0.b09 Summary: asmtools disassembler and assembler plugin for %{name} Requires: %{name} = %{version}-%{release} @@ -123,7 +122,6 @@ This package provides bindings and requirements to asmtools7 disassembler and as %patch62 -p0 %patch63 -p0 %patch7 -p1 -%patch8 -p1 %build pushd runtime-decompiler @@ -229,6 +227,18 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json %license LICENSE %changelog +* Wed Jan 03 2024 Fedora Release Engineering - 9.1-1 +- update dto 9.1 +- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.1 +- https://github.com/judovana/java-runtime-decompiler/releases/tag/java-runtime-decompiler-9.0 + +* Fri Oct 13 2023 Fedora Release Engineering - 8.0-1 +- update dto 8.0 +- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-8.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Fedora Release Engineering - 7.3-3 - strictly needing jdk17 unless user says differently diff --git a/removeMultilineSpotbugs.patch b/removeMultilineSpotbugs.patch index e612855..f8ddbb9 100644 --- a/removeMultilineSpotbugs.patch +++ b/removeMultilineSpotbugs.patch @@ -49,4 +49,17 @@ /** * Warning, possibly unused, rotten code. */ +--- a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java ++++ a/runtime-decompiler/src/main/java/org/jrd/frontend/frame/main/decompilerview/TextWithControls.java +@@ -103,10 +103,6 @@ + //currently standalone dialog supports only additions + //and additions do not support classlaoder selection (obviously) + //the classlaoder now remain thus unused +- @SuppressFBWarnings( +- value = "SS_SHOULD_BE_STATIC", +- justification = "is really per instance, however will ahve sense, only if standalone dialog will support overwrite, which is unlikely" +- ) + private final boolean overvriteEnabled = false; + //field to hots the target classlaoder if it willbe ever supported + //it is now null, what is waht the only ussage in compiler.compile(toCompile, pluginManager, classloader); needs diff --git a/sources b/sources index 2e91c7f..639b6d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (java-runtime-decompiler-7.3.tar.gz) = dc45ee8fa53d3f3f6479f9d2d8978a714731d1cb333fe4e15321564bc049d6cde90e2e618d304df24bbcb6dec23cca6cb5373e867c8ec45212746b344e65a1e2 +SHA512 (java-runtime-decompiler-9.1.tar.gz) = 9373d08d9482614561726ab82b3f116136c79bf9758950276cf3043c6443425c17b43699d19cd33eb0761e3819795249a304135d64185989dcc1eeb59a9c671d diff --git a/systemJasm.patch b/systemJasm.patch index eff068f..dc2991d 100644 --- a/systemJasm.patch +++ b/systemJasm.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJasmG.patch b/systemJasmG.patch index 0171e99..81b6665 100644 --- a/systemJasmG.patch +++ b/systemJasmG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JasmGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JasmGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoder.patch b/systemJcoder.patch index cf6ce68..bd2690a 100644 --- a/systemJcoder.patch +++ b/systemJcoder.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools" diff --git a/systemJcoderG.patch b/systemJcoderG.patch index 85d8a63..4e07a9c 100644 --- a/systemJcoderG.patch +++ b/systemJcoderG.patch @@ -6,7 +6,7 @@ - "WrapperURL": "file://${XDG_CONFIG_HOME}/plugins/JcoderGDecompilerWrapper.java", + "WrapperURL": "file:/etc/java-runtime-decompiler/plugins/JcoderGDecompilerWrapper.java", "DependencyURL": [ -- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b02-ea/asmtools-8.0.b02-ea.jar" +- "file://${HOME}/.m2/repository/org/openjdk/asmtools/8.0.b09-ea/asmtools-8.0.b09-ea.jar" + "file:/usr/share/java/openjdk-asmtools/asmtools.jar" ], "DecompilerDownloadURL": "https://github.com/openjdk/asmtools"