From 212cce337e60b4d08db9dc8ca4961e978ec225de Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 10 Jan 2019 16:54:50 +0100 Subject: [PATCH 1/2] changes for epel jpackage-utils instead of javapackages-tools; simple javac+jar instead of gradle --- fernflower.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fernflower.spec b/fernflower.spec index fe5f799..6d38b06 100644 --- a/fernflower.spec +++ b/fernflower.spec @@ -19,14 +19,13 @@ Source1: %{name} Source2: create-sources.sh Patch0: remove_main.patch BuildArch: noarch -BuildRequires: javapackages-tools +BuildRequires: jpackage-utils BuildRequires: java-devel -BuildRequires: gradle-local %if %{with_javadoc} BuildRequires: zip %endif Requires: java-headless -Requires: javapackages-tools +Requires: jpackage-utils %description @@ -38,7 +37,7 @@ please send your bug reports and improvement suggestions to the issue tracker. %package javadoc Summary: %{name} API documentation Group: Documentation -Requires: javapackages-filesystem +Requires: jpackage-utils BuildArch: noarch %description javadoc @@ -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 @@ -96,4 +101,5 @@ cp %{name}.zip $RPM_BUILD_ROOT/%{_javadocdir}/ %changelog * Wed Jan 09 2019 Jiri Vanek - 183.5153.8-1 +- changes for epel jpackage-utils instead of javapackages-tools; simple javac+jar instead of gradle - initial package From ab3dc6adf00de9d35e9a2d6ec42fe1d31c00640e Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 18 Jan 2019 19:06:53 +0100 Subject: [PATCH 2/2] 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 6d38b06..a7c644b 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 @@ -26,6 +26,7 @@ BuildRequires: zip %endif Requires: java-headless Requires: jpackage-utils +Provides: %{name}-decompiler %description @@ -39,6 +40,7 @@ Summary: %{name} API documentation Group: Documentation Requires: jpackage-utils BuildArch: noarch +Provides: %{name}-decompiler-javadoc %description javadoc The %{name} 100% empty API documentation. @@ -100,6 +102,9 @@ 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 - changes for epel jpackage-utils instead of javapackages-tools; simple javac+jar instead of gradle - initial package