Hello community, here is the log from the commit of package sbinary for openSUSE:Factory checked in at 2019-12-03 12:40:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbinary (Old) and /work/SRC/openSUSE:Factory/.sbinary.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbinary" Tue Dec 3 12:40:42 2019 rev:3 rq:752801 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sbinary/sbinary.changes 2019-11-28 13:50:24.186705498 +0100 +++ /work/SRC/openSUSE:Factory/.sbinary.new.4691/sbinary.changes 2019-12-03 12:41:49.762141955 +0100 @@ -1,0 +2,7 @@ +Mon Dec 2 07:27:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Require scala 2.10.7 for build: allows building with jdk11 +- Clean up dependencies in order not to require maven, since + we are not building using it. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbinary.spec ++++++ --- /var/tmp/diff_new_pack.D18kwE/_old 2019-12-03 12:41:50.714141691 +0100 +++ /var/tmp/diff_new_pack.D18kwE/_new 2019-12-03 12:41:50.718141690 +0100 @@ -31,8 +31,9 @@ Source0: https://github.com/harrah/sbinary/archive/v%{sbinary_version}.tar.gz Source1: https://raw.github.com/willb/climbing-nemesis/master/climbing-nemesis.py BuildRequires: fdupes -BuildRequires: maven-local -BuildRequires: scala +BuildRequires: java-devel +BuildRequires: javapackages-local +BuildRequires: scala >= 2.10.7 BuildRequires: mvn(net.sourceforge.fmpp:fmpp) BuildRequires: mvn(org.beanshell:bsh) BuildRequires: mvn(org.freemarker:freemarker) @@ -43,11 +44,7 @@ %if %{build_with_sbt} BuildRequires: python BuildRequires: sbt -%else -BuildRequires: java-devel %endif -# scalac needs java-devel <= 1.8 -BuildConflicts: java-devel >= 9 %description @@ -111,10 +108,18 @@ java -cp $(build-classpath fmpp freemarker bsh2 oro) fmpp.tools.CommandLine -S core/src -O core/target/scala-%{scala_version}/src_managed -scalac core/target/scala-%{scala_version}/src_managed/*.scala -d core/target/scala-%{scala_version}/classes +scalac \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -nobootcp \ +%endif + core/target/scala-%{scala_version}/src_managed/*.scala -d core/target/scala-%{scala_version}/classes jar -cvf core/target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.jar -C core/target/scala-%{scala_version}/classes . -scaladoc core/target/scala-2.10/src_managed/*.scala -d core/target/scala-2.10/api +scaladoc \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -nobootcp \ +%endif + core/target/scala-2.10/src_managed/*.scala -d core/target/scala-2.10/api cat << EOF > core/target/scala-%{scala_version}/%{name}_%{scala_version}-%{version}.pom <?xml version='1.0' encoding='UTF-8'?>
