Hello community, here is the log from the commit of package bsh2 for openSUSE:Factory checked in at 2019-02-11 21:17:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsh2 (Old) and /work/SRC/openSUSE:Factory/.bsh2.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsh2" Mon Feb 11 21:17:20 2019 rev:34 rq:672361 version:2.0.0.b6 Changes: -------- --- /work/SRC/openSUSE:Factory/bsh2/bsh2.changes 2018-11-06 14:26:58.969650395 +0100 +++ /work/SRC/openSUSE:Factory/.bsh2.new.28833/bsh2.changes 2019-02-11 21:17:22.787337464 +0100 @@ -1,0 +2,6 @@ +Thu Feb 7 07:17:36 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against javacc and glassfish-servlet-api instead of + javacc3 and servlet4 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsh2.spec ++++++ --- /var/tmp/diff_new_pack.pmgphT/_old 2019-02-11 21:17:23.675336992 +0100 +++ /var/tmp/diff_new_pack.pmgphT/_new 2019-02-11 21:17:23.683336988 +0100 @@ -1,7 +1,7 @@ # # spec file for package bsh2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -38,11 +38,10 @@ BuildRequires: bsf BuildRequires: bsf-javadoc BuildRequires: fdupes +BuildRequires: glassfish-servlet-api BuildRequires: java-devel >= 1.8 -BuildRequires: javacc3 -# Needed for maven conversions +BuildRequires: javacc BuildRequires: javapackages-local -BuildRequires: servletapi4 Requires: bsf Requires: javapackages-tools BuildArch: noarch @@ -129,9 +128,9 @@ mv tests/test-scripts/Data/addclass.jar.no tests/test-scripts/Data/addclass.jar %build -build-jar-repository -s -p lib bsf javacc3 servlet +build-jar-repository -s -p lib bsf javacc glassfish-servlet-api pushd engine/javax-src/ -javac -cp $(build-classpath servlet) -source 8 -target 8 $(find . -name "*.java") +javac -cp $(build-classpath glassfish-servlet-api) -source 8 -target 8 $(find . -name "*.java") jar cf ../../lib/javaxscript.jar $(find . -name "*.class" -o -name "*.html") popd # set VERSION
