From c91345d46838a9fb9d1c8f5a1860fc212fc13434 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 18 Jan 2019 19:03:39 +0100 Subject: [PATCH 01/27] added virtual provides of fernflower-decompiler and fernflower-decompiler-javadoc --- fernflower.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index fe5f799..10c8f7e 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JIdea's java decompiler Group: Development/Tools License: ASL 2.0 @@ -27,6 +27,7 @@ BuildRequires: zip %endif Requires: java-headless Requires: javapackages-tools +Provides: %{name}-decompiler %description @@ -40,6 +41,7 @@ Summary: %{name} API documentation Group: Documentation Requires: javapackages-filesystem BuildArch: noarch +Provides: %{name}-decompiler-javadoc %description javadoc The %{name} 100% empty API documentation. @@ -95,5 +97,8 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Fri Jan 18 2019 Jiri Vanek - 183.5153.8-2 +- added virtual provides of fernflower-decompiler and fernflower-decompiler-javadoc + * Wed Jan 09 2019 Jiri Vanek - 183.5153.8-1 - initial package From 38f67dd265d332f915912448c175356dacd25cbf Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:44 +0100 Subject: [PATCH 02/27] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- fernflower.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index 10c8f7e..94465a4 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -7,7 +7,6 @@ Name: fernflower Version: 183.5153.8 Release: 2%{?dist} Summary: JIdea's java decompiler -Group: Development/Tools License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine #Source0: https://github.com/JetBrains/intellij-community/archive/idea/%%{version}.tar.gz @@ -38,7 +37,6 @@ please send your bug reports and improvement suggestions to the issue tracker. %if %{with_javadoc} %package javadoc Summary: %{name} API documentation -Group: Documentation Requires: javapackages-filesystem BuildArch: noarch Provides: %{name}-decompiler-javadoc From 4356c028863406982785c51cde5e081d66dbb1d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 19:37:54 +0000 Subject: [PATCH 03/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 94465a4..89aa125 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -95,6 +95,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 183.5153.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 18 2019 Jiri Vanek - 183.5153.8-2 - added virtual provides of fernflower-decompiler and fernflower-decompiler-javadoc From 18adabb7e47921aa12049e069ecff617d6fa3ce7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 00:29:22 +0000 Subject: [PATCH 04/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 89aa125..c3e7102 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -95,6 +95,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 183.5153.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 183.5153.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3adfe19f83923d2e6581a66cb2dc2cecf41bb7c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 18:24:20 +0000 Subject: [PATCH 05/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index c3e7102..59e778c 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -95,6 +95,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 183.5153.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 183.5153.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3608fc5cc01250bcb0172028d873020e14d794a6 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 18 Feb 2020 10:17:45 +0100 Subject: [PATCH 06/27] moved to gradle-less build --- fernflower.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index 59e778c..686f7bc 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -20,7 +20,6 @@ Patch0: remove_main.patch BuildArch: noarch BuildRequires: javapackages-tools BuildRequires: java-devel -BuildRequires: gradle-local %if %{with_javadoc} BuildRequires: zip %endif @@ -60,7 +59,13 @@ find | grep "\\.jar$" && exit 1 %patch0 %build -%gradle_build --skip-install jar +mkdir build +javac -d build `find src -type f` +cd build +jar -cf ../%{name}.jar org +cd .. +mkdir build/libs +mv %{name}.jar build/libs/ %if %{with_javadoc} # this is sad. Javadoc is really 100% empty mkdir fernflower-javadoc @@ -95,6 +100,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Tue Feb 18 2020 Jiri Vanek - 183.5153.8-6 +- moved to gradle-less build + * Tue Jan 28 2020 Fedora Release Engineering - 183.5153.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6b403667ce136e2369bf76e73c0ea1e19a6e8c41 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 19:09:58 +0200 Subject: [PATCH 07/27] Rebuilt for JDK-11 --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 686f7bc..9753644 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -100,6 +100,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Fri Jul 10 2020 Jiri Vanek - 183.5153.8-7 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Feb 18 2020 Jiri Vanek - 183.5153.8-6 - moved to gradle-less build From d422f7f356ad19e84a4550a33756b3352f9be58a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:22:47 +0000 Subject: [PATCH 08/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 9753644..237412f 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -100,6 +100,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 183.5153.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 183.5153.8-7 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 932abd2e8641dfa0d9d97f4f5168b3f3c67e809b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 10 Dec 2020 13:49:35 +0100 Subject: [PATCH 09/27] set source/target of 8 --- fernflower.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index 237412f..0c08ce0 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -60,7 +60,7 @@ find | grep "\\.jar$" && exit 1 %build mkdir build -javac -d build `find src -type f` +javac -source 8 -target 8 -d build `find src -type f` cd build jar -cf ../%{name}.jar org cd .. @@ -100,6 +100,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Fri Dec 10 2020 Jiri Vanek - 183.5153.8-9 +- set source/target of 8 + * Mon Jul 27 2020 Fedora Release Engineering - 183.5153.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 06121b3df09146e24b425c354ccc391a2f6410d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:28:31 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 0c08ce0..a620412 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 183.5153.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -100,6 +100,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 183.5153.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Dec 10 2020 Jiri Vanek - 183.5153.8-9 - set source/target of 8 From 5c3d7243058f123c84cc9e40bfdb9024d901540b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 2 Jun 2021 15:08:59 +0200 Subject: [PATCH 11/27] Update to upstream version 211.7442.40 --- .gitignore | 1 + create-sources.sh | 13 ++----------- fernflower | 1 - fernflower.spec | 17 ++++++++++++----- port_to_java_8.patch | 13 +++++++++++++ remove_main.patch | 14 ++++++-------- sources | 2 +- 7 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 port_to_java_8.patch diff --git a/.gitignore b/.gitignore index 3dfb296..70ae512 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /fernflower-183.5153.8.tar.gz +/fernflower-211.7442.40.tar.gz diff --git a/create-sources.sh b/create-sources.sh index d21de1d..6a9b44c 100644 --- a/create-sources.sh +++ b/create-sources.sh @@ -1,13 +1,13 @@ # idea soources have 280MB # decompiler itself is 375kB now, including test classes... -VERSION=183.5153.8 +VERSION=211.7442.40 INPUT=$VERSION.tar.gz TOP_DIR=intellij-community-idea-$VERSION DECOMPILER_DIR=$TOP_DIR/plugins/java-decompiler NAME=fernflower OUT_NAME=$NAME-$VERSION OUTPUT=$OUT_NAME.tar.gz -TEST=true; + if [ -e $OUTPUT ] ; then echo "$OUTPUT already exists" else @@ -29,12 +29,3 @@ else mv $DECOMPILER_DIR/$OUTPUT . rm -rf $TOP_DIR fi -if [ $TEST == "true" ] ; then - tar -xvf $OUTPUT - pushd $OUT_NAME - gradle-local jar - find | grep $NAME.jar - popd -fi - - diff --git a/fernflower b/fernflower index 07e3d6a..5adcf15 100644 --- a/fernflower +++ b/fernflower @@ -5,4 +5,3 @@ MAIN_CLASS=org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler set_classpath fernflower run ${@} - diff --git a/fernflower.spec b/fernflower.spec index a620412..e2136f5 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -4,11 +4,12 @@ %global with_javadoc 1 Name: fernflower -Version: 183.5153.8 -Release: 10%{?dist} +Version: 211.7442.40 +Release: 1%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine + #Source0: https://github.com/JetBrains/intellij-community/archive/idea/%%{version}.tar.gz # this source is 280MB big, so only the decompiler is repacked via create-sources.sh and has 350kB # generated by source2; `create-sources.sh 183.5153.8` @@ -16,8 +17,12 @@ Source0: %{name}-%{version}.tar.gz # launcher Source1: %{name} Source2: create-sources.sh + Patch0: remove_main.patch +Patch1: port_to_java_8.patch + BuildArch: noarch + BuildRequires: javapackages-tools BuildRequires: java-devel %if %{with_javadoc} @@ -27,7 +32,6 @@ Requires: java-headless Requires: javapackages-tools Provides: %{name}-decompiler - %description JIdea's decompiler is the first actually working analytical decompiler for Java and probably for a high-level programming language in general. Naturally it is still under development, @@ -57,6 +61,7 @@ find | grep "\\.class$" && exit 1 find | grep "\\.jar$" && exit 1 #removing main method from entry point jar %patch0 +%patch1 -p1 %build mkdir build @@ -75,7 +80,6 @@ cd .. zip -r %{name}.zip fernflower-javadoc %endif - %install mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/ # cusotm launcher for main method in main jar @@ -100,10 +104,13 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jun 02 2021 Marian Koncek - 211.7442.40-1 +- Update to upstream version 211.7442.40 + * Tue Jan 26 2021 Fedora Release Engineering - 183.5153.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Fri Dec 10 2020 Jiri Vanek - 183.5153.8-9 +* Thu Dec 10 2020 Jiri Vanek - 183.5153.8-9 - set source/target of 8 * Mon Jul 27 2020 Fedora Release Engineering - 183.5153.8-8 diff --git a/port_to_java_8.patch b/port_to_java_8.patch new file mode 100644 index 0000000..20ae101 --- /dev/null +++ b/port_to_java_8.patch @@ -0,0 +1,13 @@ +diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java +index bb8b4dd..30fcb9b 100644 +--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java ++++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java +@@ -342,7 +342,7 @@ public class SFormsFastMapDirect { + if (ent != null) { + final int key = i == 0 ? ikey : (i == 1 ? ikey + VarExprent.STACK_BASE : -ikey); + +- list.add(new Entry<>() { ++ list.add(new Entry>() { + + private final Integer var = key; + private final FastSparseSet val = ent; diff --git a/remove_main.patch b/remove_main.patch index c144656..6490081 100644 --- a/remove_main.patch +++ b/remove_main.patch @@ -1,13 +1,13 @@ ---- build.gradle 2018-12-24 11:27:21.000000000 +0100 -+++ build.gradle.orig 2019-01-02 15:29:35.875645761 +0100 -@@ -10,15 +10,6 @@ +--- build.gradle 2021-05-31 12:00:45.000000000 +0200 ++++ build.gradle.rej 2021-06-02 14:27:41.778875605 +0200 +@@ -11,15 +11,6 @@ test.java.srcDirs 'test' } -repositories { jcenter() } -dependencies { -- testCompile 'junit:junit:4.+' -- testCompile 'org.assertj:assertj-core:3.+' +- testCompile 'junit:junit:4.12' +- testCompile 'org.assertj:assertj-core:3.12.2' -} - jar { @@ -15,6 +15,4 @@ - manifest { - attributes 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler' - } --} -\ No newline at end of file -+} + } diff --git a/sources b/sources index 377aa4b..472a918 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fernflower-183.5153.8.tar.gz) = efaa1dc107ba62e38cda59fdfddfd6f5d22d01ecbd22bdeff29ec3a57622309e5f89a7025af52f018f7250b6d840bb7ccd64a4a51dc92bbc470911d1b289372a +SHA512 (fernflower-211.7442.40.tar.gz) = 54138ec2987f27887dc7a882d0e4d5bf6a1a7c4d9f8e73bafd7cd957181779bb59a413117cd65dd29973c9072f5b89f797c78581113f83043191894b0631ab31 From 1c04504e35b6f179cb8095309fad5ec273458d5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:54:06 +0000 Subject: [PATCH 12/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index e2136f5..7787d10 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -104,6 +104,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 211.7442.40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 02 2021 Marian Koncek - 211.7442.40-1 - Update to upstream version 211.7442.40 From 1b1c5d42b7be55572728bedf026060ee4adbe2e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:56:18 +0000 Subject: [PATCH 13/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 7787d10..bf79d91 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -104,6 +104,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 211.7442.40-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 211.7442.40-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 05888877295ee14f02eb2691f1e5c42bc4918af8 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:37:01 +0100 Subject: [PATCH 14/27] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index bf79d91..51f09d2 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -104,6 +104,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Sat Feb 05 2022 Jiri Vanek - 211.7442.40-4 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 211.7442.40-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b37df9aa707d32d6e566d739d8ae1158225292be Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 15:17:00 +0200 Subject: [PATCH 15/27] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- fernflower.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 51f09d2..a2a436f 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -22,6 +22,7 @@ Patch0: remove_main.patch Patch1: port_to_java_8.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: javapackages-tools BuildRequires: java-devel @@ -104,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Fri Jul 08 2022 Jiri Vanek - 211.7442.40-5 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 211.7442.40-4 - Rebuilt for java-17-openjdk as system jdk From 4b5b17b2e43ab6c14d8e3fb8fc16606f88104362 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:05:58 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index a2a436f..f60f7e7 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 211.7442.40-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 211.7442.40-5 - Rebuilt for Drop i686 JDKs From 0a7ec1c3ecfb19af671e93db40e91c04c3f31857 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:21:53 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index f60f7e7..a9d18c8 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 211.7442.40-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 211.7442.40-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fd180cf228f917260537c180c420867a1ae338ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:36:36 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index a9d18c8..214d579 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 211.7442.40-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 211.7442.40-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 694958e372f079dc41d316529e828f0d53c0f4db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:13:27 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 214d579..13a3fef 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 8%{?dist} +Release: 9%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 211.7442.40-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 211.7442.40-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 11ad99b2a9e52410f32713e01161b94d0650ea0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 11:29:26 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 13a3fef..11d35c4 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 9%{?dist} +Release: 10%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 211.7442.40-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 211.7442.40-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From da3903dd341b01fa00cf32370fcb66f09273841a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:26:55 +0100 Subject: [PATCH 21/27] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 11d35c4..36f88b7 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 10%{?dist} +Release: 11%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Tue Feb 27 2024 Jiri Vanek - 211.7442.40-11 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 211.7442.40-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dc75f0c262d607567a1127fe29d35584b8013a0c Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 22/27] Eliminate use of obsolete %patchN syntax (#2283636) --- fernflower.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index 36f88b7..562ea83 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -61,8 +61,8 @@ rm -vf gradle/wrapper/gradle-wrapper.jar find | grep "\\.class$" && exit 1 find | grep "\\.jar$" && exit 1 #removing main method from entry point jar -%patch0 -%patch1 -p1 +%patch -P0 +%patch -P1 -p1 %build mkdir build From f8175c2dd3e814d501538483146503156ff5232b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:03:12 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 562ea83..4270191 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 11%{?dist} +Release: 12%{?dist} Summary: JIdea's java decompiler License: ASL 2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine @@ -105,6 +105,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 211.7442.40-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 211.7442.40-11 - Rebuilt for java-21-openjdk as system jdk From 495ce98a25eac6be68c2cd0e8b5cd33072c7e67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 15:35:00 +0200 Subject: [PATCH 24/27] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- fernflower.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index 4270191..0ae4a06 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,9 +5,10 @@ Name: fernflower Version: 211.7442.40 -Release: 12%{?dist} +Release: 13%{?dist} Summary: JIdea's java decompiler -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://github.com/JetBrains/intellij-community/tree/master/plugins/java-decompiler/engine #Source0: https://github.com/JetBrains/intellij-community/archive/idea/%%{version}.tar.gz @@ -105,6 +106,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jul 24 2024 Miroslav Suchý - 211.7442.40-13 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 211.7442.40-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 145f40ad1e2b6791825b97b0db7a305d39991dc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:10:39 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index 0ae4a06..a30b3c0 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 13%{?dist} +Release: 14%{?dist} Summary: JIdea's java decompiler # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -106,6 +106,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 211.7442.40-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 24 2024 Miroslav Suchý - 211.7442.40-13 - convert license to SPDX From cd24147d41cfd75b8855e4d3bc3b29a92ddef5cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:28:40 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fernflower.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fernflower.spec b/fernflower.spec index a30b3c0..f44efcf 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 14%{?dist} +Release: 15%{?dist} Summary: JIdea's java decompiler # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -106,6 +106,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 211.7442.40-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 211.7442.40-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 346c5983aa8630a8858fdc91554678655b6b4442 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 18:57:09 +0200 Subject: [PATCH 27/27] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- fernflower.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index f44efcf..daa1e57 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -5,7 +5,7 @@ Name: fernflower Version: 211.7442.40 -Release: 15%{?dist} +Release: 16%{?dist} Summary: JIdea's java decompiler # Automatically converted from old format: ASL 2.0 - review is highly recommended. License: Apache-2.0 @@ -26,11 +26,11 @@ BuildArch: noarch ExclusiveArch: %{java_arches} noarch BuildRequires: javapackages-tools -BuildRequires: java-devel +BuildRequires: java-25-devel %if %{with_javadoc} BuildRequires: zip %endif -Requires: java-headless +Requires: java-25-headless Requires: javapackages-tools Provides: %{name}-decompiler @@ -106,6 +106,9 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %endif %changelog +* Mon Jul 28 2025 jiri vanek - 211.7442.40-16 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 211.7442.40-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild