Hello community, here is the log from the commit of package opa-fmgui for openSUSE:Factory checked in at 2017-10-03 23:17:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opa-fmgui (Old) and /work/SRC/openSUSE:Factory/.opa-fmgui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opa-fmgui" Tue Oct 3 23:17:24 2017 rev:4 rq:528669 version:10.1.0.0.115 Changes: -------- --- /work/SRC/openSUSE:Factory/opa-fmgui/opa-fmgui.changes 2017-09-12 19:56:16.315678205 +0200 +++ /work/SRC/openSUSE:Factory/.opa-fmgui.new/opa-fmgui.changes 2017-10-03 23:17:27.169001725 +0200 @@ -1,0 +2,7 @@ +Mon Sep 25 14:41:13 UTC 2017 - [email protected] + +- Update embedded gradle binaries to 3.2 to support JDK9 +- Add opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch to fix + compilation with JDK9 + +------------------------------------------------------------------- Old: ---- gradle-2.9-bin.zip New: ---- gradle-3.2-bin.zip opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opa-fmgui.spec ++++++ --- /var/tmp/diff_new_pack.9rEZYX/_old 2017-10-03 23:17:30.348554253 +0200 +++ /var/tmp/diff_new_pack.9rEZYX/_new 2017-10-03 23:17:30.348554253 +0200 @@ -24,7 +24,7 @@ %define appfolder opa-fmgui %define appjar opa-fmgui.jar %define _binary_payload w9.gzdio -%define gradle_version 2.9 +%define gradle_version 3.2 Name: opa-fmgui Version: 10.1.0.0.115 @@ -77,6 +77,7 @@ # Patch auto extracted by service Patch5: stl-14927-jgraphx-update.patch Patch6: manifest-version.patch +Patch7: opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch BuildRequires: ant BuildRequires: jre >= 1.7 @@ -102,12 +103,13 @@ %patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 %build (cd %{_tmppath}; rm -Rf gradle-%{gradle_version}; unzip %{_sourcedir}/gradle-%{gradle_version}-bin.zip) GRADLE_LIB_DIR=%{_sourcedir} export GRADLE_LIB_DIR -%{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps build --info +%{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps buildOPA --info %install mkdir -p %{buildroot}%{_javadir}/%{appfolder} ++++++ opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch ++++++ diff --git build.xml build.xml index a7f6209..84f4c59 100644 --- build.xml +++ build.xml @@ -1,4 +1,4 @@ -<project name ="FMGUI" default="build" basedir="."> +<project name ="FMGUI" default="buildOPA" basedir="."> <property name="src" value="src"/> <property name="target" value="target"/> <property name="resources" value="resources"/> @@ -18,7 +18,7 @@ </condition> </target> <target name="compile" description="Compiles the Fabric Manager GUI application"> - <javac srcdir="${src}" destdir="${target}/classes" + <javac target="1.7" srcdir="${src}" destdir="${target}/classes" encoding="windows-1252" debug="true" fork="yes" @@ -53,7 +53,7 @@ <target name="clear" description="Clears build files"> <delete dir="${target}"/> </target> - <target name="build" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar"> + <target name="buildOPA" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar"> <echo message="Fabric Manager GUI application has been built: ${target}/${opa-fmgui.app.jar}"/> </target> </project>
