SHA256
1
0
forked from pool/opa-fmgui

Accepting request 1121518 from home:fstrba:branches:science:HPC

fix build in factory

OBS-URL: https://build.opensuse.org/request/show/1121518
OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=47
This commit is contained in:
Nicolas Morey 2023-11-01 15:53:29 +00:00 committed by Git OBS Bridge
parent 09bffafab1
commit a1f35cdf22
3 changed files with 12 additions and 4 deletions

View File

@ -13,7 +13,7 @@ index a7f6209..84f4c59 100644
</target> </target>
<target name="compile" description="Compiles the Fabric Manager GUI application"> <target name="compile" description="Compiles the Fabric Manager GUI application">
- <javac srcdir="${src}" destdir="${target}/classes" - <javac srcdir="${src}" destdir="${target}/classes"
+ <javac target="1.7" srcdir="${src}" destdir="${target}/classes" + <javac target="1.8" srcdir="${src}" destdir="${target}/classes"
encoding="windows-1252" encoding="windows-1252"
debug="true" debug="true"
fork="yes" fork="yes"

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 31 22:45:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
+ Build with java source/target levels 8
+ Fixes building with JDK21
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 11 13:00:04 UTC 2022 - Fridrich Strba <fstrba@suse.com> Mon Apr 11 13:00:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package opa-fmgui # spec file for package opa-fmgui
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2015 Intel Corporation # Copyright (c) 2015 Intel Corporation
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -75,12 +75,12 @@ Patch2: manifest-version.patch
Patch3: opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch Patch3: opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: java-devel >= 1.7 BuildRequires: java-devel >= 1.8
BuildRequires: openssl BuildRequires: openssl
BuildRequires: unzip BuildRequires: unzip
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: wget BuildRequires: wget
Requires: jre >= 1.7 Requires: jre >= 1.8
Requires: mlocate Requires: mlocate
# BuildRequires: gradle # BuildRequires: gradle
BuildArch: noarch BuildArch: noarch