From 1bdb6052d110834d5930a5aba4c82db2937b035748355894dad274c9dbc60338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Wed, 19 Apr 2017 06:40:09 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=18 --- gradle-2.9-bin.zip | 3 +++ gradle-3.5-bin.zip | 3 --- opa-fmgui.changes | 2 +- opa-fmgui.spec | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 gradle-2.9-bin.zip delete mode 100644 gradle-3.5-bin.zip diff --git a/gradle-2.9-bin.zip b/gradle-2.9-bin.zip new file mode 100644 index 0000000..973c214 --- /dev/null +++ b/gradle-2.9-bin.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f +size 44786923 diff --git a/gradle-3.5-bin.zip b/gradle-3.5-bin.zip deleted file mode 100644 index c7934ca..0000000 --- a/gradle-3.5-bin.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0b7450798c190ff76b9f9a3d02e18b33d94553f708ebc08ebe09bdf99111d110 -size 73331577 diff --git a/opa-fmgui.changes b/opa-fmgui.changes index 4433419..75b1634 100644 --- a/opa-fmgui.changes +++ b/opa-fmgui.changes @@ -8,7 +8,7 @@ Wed Apr 5 08:46:46 UTC 2017 - josef.moellers@suse.com 4:opa-fmgui-fix-detection-of-OpenJDK.patch Some changes to SPEC file were necessary. Replaced 24 JAR files by 11 new ones. - Removed BuildRequirement "gradle" as we do not have it. + Added pre-built gradle-2.9 for build phase. [FATE#321477] ------------------------------------------------------------------- diff --git a/opa-fmgui.spec b/opa-fmgui.spec index af87f4e..9f9a97f 100644 --- a/opa-fmgui.spec +++ b/opa-fmgui.spec @@ -43,7 +43,7 @@ Source9: swingx-mavensupport-1.6.5.jar Source10: swingx-painters-1.6.5.jar Source11: swingx-plaf-1.6.5.jar Source12: swingx-testsupport-1.6.5.jar -Source13: gradle-3.5-bin.zip +Source13: gradle-2.9-bin.zip Patch1: gradle-use_local_repo.patch Patch3: opa-fmgui-intel-manifest-license.patch @@ -75,10 +75,10 @@ script fmgui. %patch6 -p1 %build -(cd %{_tmppath}; unzip $RPM_SOURCE_DIR/gradle-3.5-bin.zip) +(cd %{_tmppath}; unzip $RPM_SOURCE_DIR/gradle-2.9-bin.zip) GRADLE_LIB_DIR=$RPM_SOURCE_DIR export GRADLE_LIB_DIR -%{_tmppath}/gradle-3.5/bin/gradle copyDeps build --info +%{_tmppath}/gradle-2.9/bin/gradle copyDeps build --info %install mkdir -p %{buildroot}%{_javadir}/%{appfolder}