Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package projectlibre for openSUSE:Factory checked in at 2022-04-08 22:46:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/projectlibre (Old) and /work/SRC/openSUSE:Factory/.projectlibre.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectlibre" Fri Apr 8 22:46:10 2022 rev:7 rq:967825 version:1.9.3 Changes: -------- --- /work/SRC/openSUSE:Factory/projectlibre/projectlibre.changes 2021-02-18 20:52:23.087437921 +0100 +++ /work/SRC/openSUSE:Factory/.projectlibre.new.1900/projectlibre.changes 2022-04-08 22:46:34.250571686 +0200 @@ -1,0 +2,10 @@ +Fri Apr 8 12:48:50 UTC 2022 - Fridrich Strba <[email protected]> + +- Build with java source and target levels 8 + * fixes build in Factory with jdk17 +- Added patch: + * projectlibre-nosourcetarget.patch + + Do not hardcore java source and target levels in the build.xml + files. Allow them to be specified from ant command-line + +------------------------------------------------------------------- New: ---- projectlibre-nosourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ projectlibre.spec ++++++ --- /var/tmp/diff_new_pack.aetdIl/_old 2022-04-08 22:46:35.230560808 +0200 +++ /var/tmp/diff_new_pack.aetdIl/_new 2022-04-08 22:46:35.234560764 +0200 @@ -1,7 +1,7 @@ # # spec file for package projectlibre # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,9 +27,11 @@ Source1: %{name}.desktop Source2: %{name}.png Source3: x-%{name}.desktop +Patch0: %{name}-nosourcetarget.patch BuildRequires: ant +BuildRequires: java-devel >= 1.8 BuildRequires: update-desktop-files -Requires: java >= 1.6.0 +Requires: java >= 1.8 BuildArch: noarch %description @@ -39,13 +41,14 @@ %prep %setup -q +%patch0 -p1 %build #Set the file encoding for source files export JAVA_TOOL_OPTIONS=-Dfile.encoding=cp1252 cd projectlibre_build/ -ant clean -ant +%{ant} clean +%{ant} -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 %install export NO_BRP_CHECK_BYTECODE_VERSION=true ++++++ projectlibre-nosourcetarget.patch ++++++ diff -urEbwB projectlibre-1.9.3.orig/projectlibre_build/build.xml projectlibre-1.9.3/projectlibre_build/build.xml --- projectlibre-1.9.3.orig/projectlibre_build/build.xml 2022-04-08 14:44:59.861913215 +0200 +++ projectlibre-1.9.3/projectlibre_build/build.xml 2022-04-08 14:46:12.946356116 +0200 @@ -98,9 +98,7 @@ <javac destdir="${build}" classpathref="compile.class.path" debug="off" - nowarn="on" - source="1.6" - target="1.6"> + nowarn="on"> <src path="${src_core}" /> <src path="${src_ui}" /> <src path="${src_reports}" /> @@ -115,9 +113,7 @@ <javac destdir="${build}" classpathref="compile-no_contrib_built.class.path" debug="off" - nowarn="on" - source="1.6" - target="1.6"> + nowarn="on"> <src path="${src_core}" /> <src path="${src_ui}" /> <src path="${src_reports}" /> diff -urEbwB projectlibre-1.9.3.orig/projectlibre_contrib/build.xml projectlibre-1.9.3/projectlibre_contrib/build.xml --- projectlibre-1.9.3.orig/projectlibre_contrib/build.xml 2022-04-08 14:44:59.881913336 +0200 +++ projectlibre-1.9.3/projectlibre_contrib/build.xml 2022-04-08 14:45:49.098211594 +0200 @@ -80,9 +80,7 @@ <javac destdir="${build}" classpathref="compile.class.path" debug="off" - nowarn="on" - source="1.6" - target="1.6"> + nowarn="on"> <src path="src" /> <include name="**/*" /> </javac> diff -urEbwB projectlibre-1.9.3.orig/projectlibre_core/build.xml projectlibre-1.9.3/projectlibre_core/build.xml --- projectlibre-1.9.3.orig/projectlibre_core/build.xml 2022-04-08 14:44:59.917913554 +0200 +++ projectlibre-1.9.3/projectlibre_core/build.xml 2022-04-08 14:45:35.274127818 +0200 @@ -72,9 +72,7 @@ <javac destdir="${build}" classpathref="compile.class.path" debug="off" - nowarn="on" - source="1.5" - target="1.5"> + nowarn="on"> <src path="${src}" /> <include name="**/*" /> <exclude name="**/version.properties" /> diff -urEbwB projectlibre-1.9.3.orig/projectlibre_exchange/build.xml projectlibre-1.9.3/projectlibre_exchange/build.xml --- projectlibre-1.9.3.orig/projectlibre_exchange/build.xml 2022-04-08 14:44:59.965913845 +0200 +++ projectlibre-1.9.3/projectlibre_exchange/build.xml 2022-04-08 14:45:25.058065907 +0200 @@ -103,9 +103,7 @@ <javac destdir="${build}" classpathref="compile.class.path" debug="off" - nowarn="on" - source="1.5" - target="1.5"> + nowarn="on"> <src path="${src}" /> <include name="**/*" /> <exclude name="**/version.properties" />
