Bumped to latest 7.3.

Most likely many deps missing. Will be added later
2023-07-03 18:00:21 +02:00 · 2023-07-03 18:00:21 +02:00 · bedecc2650
commit bedecc2650
parent f7d5b260a3
17 changed files with 328 additions and 69 deletions
--- a/java-runtime-decompiler.spec
+++ b/java-runtime-decompiler.spec
@ -1,21 +1,30 @@
 Summary: Application for extraction and decompilation of JVM byte code
 Name: java-runtime-decompiler
-Version: 6.1
-Release: 2%{?dist}
+Version: 7.3
+Release: 1%{?dist}
 License: GPLv3
 URL: https://github.com/pmikova/java-runtime-decompiler
 Source0: https://github.com/pmikova/%{name}/archive/%{name}-%{version}.tar.gz
-Source1: java-runtime-decompiler
+Source1: %{name}
 Source3: jrd.desktop
+Source4: jrd-hex.desktop
 Patch1: systemFernflower.patch
 Patch2: systemProcyon.patch
+Patch21: systemProcyonAssembler.patch
 Patch3: rsyntaxVersion.patch
 Patch4: systemCfr.patch
 Patch5: systemJasm.patch
+Patch51: systemJasm7.patch
+Patch52: systemJasmG.patch
+Patch53: systemJasmG7.patch
 Patch6: systemJcoder.patch
+Patch61: systemJcoder7.patch
+Patch62: systemJcoderG.patch
+Patch63: systemJcoderG7.patch
 Patch7: removeMultilineSpotbugs.patch

 BuildArch: noarch
+ExclusiveArch:  %{java_arches} noarch
 BuildRequires: maven-local
 BuildRequires: byteman
 BuildRequires: rsyntaxtextarea
@ -23,6 +32,7 @@ BuildRequires: rsyntaxtextarea
 #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
@ -32,17 +42,23 @@ BuildRequires: java-11-devel
 BuildRequires: google-gson
 BuildRequires: desktop-file-utils
 BuildRequires: classpathless-compiler
+Requires: google-gson
+Requires: byteman
+Requires: rsyntaxtextarea
 Requires: java-11-openjdk-headless
-Recommends: java-11-openjdk
 Requires: classpathless-compiler
-Recommends: fernflower
-Recommends: procyon-decompiler
-Recommends: CFR
-Recommends: openjdk-asmtools
+Requires: java-diff-utils
+Recommends: java-11-openjdk
+Recommends: %{name}-fernflower-plugin
+Recommends: %{name}-procyon-plugin
+Recommends: %{name}-cfr-plugin
+Recommends: %{name}-asmtools-plugin
+Recommends: %{name}-asmtools7-plugin

 %description
-This application can access JVM memory at runtime,
-extract byte code from the JVM and decompile it. 
+This application can access JVM at runtime,
+extract byte code from the JVM and decompile it, modify the obtained code and compile it back.
+It also works with local classpath and source path and provide standalone hex, with binary diff.

 %package javadoc
 Summary: Javadoc for %{name}
@ -51,14 +67,61 @@ Requires: %{name} = %{version}-%{release}
 %description javadoc
 This package contains the API documentation for %{name}.

+%package fernflower-plugin
+Requires: fernflower
+Summary: fernflower decompiler plugin for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description fernflower-plugin
+This package provides bindings and requirements to fernflower decompiler for %{name}.
+
+%package procyon-plugin
+Requires: procyon-decompiler >= 0.6
+Summary: procyon decompiler plugin for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description procyon-plugin
+This package provides bindings and requirements to procyon decompiler for %{name}.
+
+%package cfr-plugin
+Requires: CFR
+Summary: CFR decompiler plugin for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description cfr-plugin
+This package provides bindings and requirements to CFR decompiler for %{name}.
+
+%package asmtools-plugin
+Requires: openjdk-asmtools >= 8.0.b02.ea-0.3.20230113
+Summary: asmtools disassembler and assembler plugin for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description asmtools-plugin
+This package provides bindings and requirements to asmtools disassembler and assembler for %{name}.
+
+%package asmtools7-plugin
+Requires: openjdk-asmtools7
+Summary: asmtools7 disassembler and assembler plugin for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description asmtools7-plugin
+This package provides bindings and requirements to asmtools7 disassembler and assembler for %{name}.
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 %patch1 -p0
 %patch2 -p0
+%patch21 -p0
 %patch3 -p0
 %patch4 -p0
 %patch5 -p0
+%patch51 -p0
+%patch52 -p0
+%patch53 -p0
 %patch6 -p0
+%patch61 -p0
+%patch62 -p0
+%patch63 -p0
 %patch7 -p1

 %build
@ -74,52 +137,125 @@ for x in $a ; do
  #grep -e ".*SuppressFBWarnings.*" $x && echo "^ $x ^"
  sed "s/.*SuppressFBWarnings.*//g" $x -i
 done
-
-#export JAVA_TOOL_OPTIONS="-Dadditionalparam=-Xdoclint:none -DadditionalJOption=-Xdoclint:none"
-export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-
+xmvn --version
+echo $JAVA_HOME
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk #why?
+xmvn --version
 %mvn_build -f --xmvn-javadoc -- -Plegacy
-$JAVA_HOME/bin/java -cp /usr/share/java/classpathless-compiler/classpathless-compiler.jar:runtime-decompiler/target/runtime-decompiler-%{version}.jar org.jrd.backend.data.Help > %{name}.1
+CPLC=/usr/share/java/classpathless-compiler
+java -cp $CPLC/classpathless-compiler.jar:$CPLC/classpathless-compiler-api.jar:$CPLC/classpathless-compiler-util.jar:runtime-decompiler/target/runtime-decompiler-%{version}.jar org.jrd.backend.data.cli.Help > %{name}.1

 %install
 %mvn_install
 install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 644 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+pushd $RPM_BUILD_ROOT%{_mandir}/man1/
+  ln -s %{name}.1 jrd.1
+  ln -s %{name}.1 %{name}-hex.1
+  ln -s %{name}.1 jrd-hex.1
+popd

 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
+pushd $RPM_BUILD_ROOT%{_bindir}
+  cp %{name} %{name}-hex
+  sed 's/^run .*/run -hex "$@"/' -i %{name}-hex
+  ln -s %{name} jrd
+  ln -s %{name}-hex jrd-hex
+popd
+
 cp -r %{_builddir}/%{name}-%{name}-%{version}/runtime-decompiler/src/plugins/ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/

 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor="fedora"                     \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
+desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
+desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE4}
+
+#jd is not yet packed and sucks anyway
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.java
+rm $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/plugins/JdDecompilerWrapper.json

 %files -f .mfiles
 %attr(755, root, -) %{_bindir}/java-runtime-decompiler
-%{_mandir}/man1/java-runtime-decompiler.1*
+%attr(755, root, -) %{_bindir}/java-runtime-decompiler-hex
+%{_bindir}/jrd
+%{_bindir}/jrd-hex
+%{_mandir}/man1/java-runtime-decompiler*.1*
+%{_mandir}/man1/jrd*.1*
 # wrappers for decompilers
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
-%config %{_sysconfdir}/%{name}/plugins/FernflowerDecompilerWrapper.java
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/FernflowerDecompilerWrapper.json
-%config %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.java
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.json
-%config %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.java
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.json
-%config %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.java
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.json
-%config %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.java
-%config(noreplace) %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.json
-%license LICENSE
-
 %dir %{_datadir}/applications
 %{_datadir}/applications/fedora-jrd.desktop
+%{_datadir}/applications/fedora-jrd-hex.desktop
+
+%files fernflower-plugin
+%config %{_sysconfdir}/%{name}/plugins/FernflowerDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/FernflowerDecompilerWrapper.json
+
+%files procyon-plugin
+%config %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/ProcyonDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/ProcyonAssemblerDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/ProcyonAssemblerDecompilerWrapper.json
+
+%files cfr-plugin
+%config %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/CfrDecompilerWrapper.json
+
+%files asmtools-plugin
+%config %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JasmGDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmGDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JcoderDecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JcoderGDecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JcoderGDecompilerWrapper.json
+
+%files asmtools7-plugin
+%config %{_sysconfdir}/%{name}/plugins/Jasm7DecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/Jasm7DecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JasmG7DecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JasmG7DecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/Jcoder7DecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/Jcoder7DecompilerWrapper.json
+%config %{_sysconfdir}/%{name}/plugins/JcoderG7DecompilerWrapper.java
+%config(noreplace) %{_sysconfdir}/%{name}/plugins/JcoderG7DecompilerWrapper.json
+%license LICENSE

 %files javadoc -f .mfiles-javadoc
 %license LICENSE

 %changelog
+* Fri Jun 30 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.3-1
+- moved to 7.3
+- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.3
+- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.2
+
+* Wed Mar 15 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.1-1
+- https://github.com/pmikova/java-runtime-decompiler/releases/tag/java-runtime-decompiler-7.1
+- moved to jrd 7.1
+- added desp on java-diff and new cplc
+- fixed(?) procyon wrapper
+  - todo procyon crashes witout trace
+- removed jd wrapper (was new in 7.1, maybe will be added)
+- split plugins to subpkgs
+- added jrd-hex launcher
+- added hex launcher, added jrd symlinks
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 6.1-4
+- Rebuilt for Drop i686 JDKs
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 6.1-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sun Dec 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0.pre.3-1
 - bumped sources to upstream rc candidate