Hello community, here is the log from the commit of package bsf for openSUSE:Leap:15.2 checked in at 2020-02-05 07:27:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/bsf (Old) and /work/SRC/openSUSE:Leap:15.2/.bsf.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsf" Wed Feb 5 07:27:32 2020 rev:18 rq:763169 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/bsf/bsf.changes 2020-01-15 14:49:01.445364144 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.bsf.new.26092/bsf.changes 2020-02-05 07:27:32.950699457 +0100 @@ -1,0 +2,38 @@ +Wed Jan 8 07:30:23 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- BuildIgnore jline1 instead of jline, since the dependency of + rhino changed + +------------------------------------------------------------------- +Tue Apr 9 11:55:27 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Remove reference to parent pom, since we do not use Maven to + build this package + +------------------------------------------------------------------- +Tue Feb 12 11:14:35 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- BuildIgnore jline to avoid a build cycle + +------------------------------------------------------------------- +Tue Feb 5 16:30:07 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Clean the spec file and sanitize dependencies + +------------------------------------------------------------------- +Tue Nov 27 09:13:05 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Modified patch: + * build-file.patch + + Fix build of script providers + +------------------------------------------------------------------- +Wed May 16 05:52:07 UTC 2018 - fst...@suse.com + +- Build with source and target 8 to anticipate a possible removal + of 1.6 compatibility +- Modified patch: + * build.properties.patch + + specify source level 8 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsf.spec ++++++ --- /var/tmp/diff_new_pack.I2XK02/_old 2020-02-05 07:27:33.438699663 +0100 +++ /var/tmp/diff_new_pack.I2XK02/_new 2020-02-05 07:27:33.438699663 +0100 @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,7 +22,7 @@ Summary: Bean Scripting Framework License: Apache-2.0 Group: Development/Libraries/Java -Url: http://commons.apache.org/bsf/ +URL: http://commons.apache.org/bsf/ Source0: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz Source1: bsf-pom.xml Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz.asc @@ -32,12 +32,12 @@ BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: fdupes -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: rhino BuildRequires: xalan-j2 -BuildRequires: xml-commons-apis +#!BuildIgnore: jline1 +Requires: mvn(commons-logging:commons-logging) BuildArch: noarch %description @@ -83,17 +83,14 @@ %prep %setup -q -# remove all binary libs -find . -name "*.jar" -exec rm -f {} \; -rm -fr bsf - %patch0 -p1 %patch1 -p1 +find -name \*.jar -delete %build mkdir -p lib build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2 -%{ant} -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadocs +%{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs %install # jar @@ -110,14 +107,12 @@ cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} -%files -%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt -%{_javadir}/* -%{_mavenpomdir}/JPP-%{name}.pom -%{_datadir}/maven-metadata/%{name}.xml +%files -f .mfiles +%license LICENSE.txt NOTICE.txt +%doc AUTHORS.txt CHANGES.txt README.txt TODO.txt RELEASE-NOTE.txt %files javadoc -%dir %{_javadocdir}/%{name} +%license LICENSE.txt NOTICE.txt %{_javadocdir}/%{name} %changelog ++++++ bsf-pom.xml ++++++ --- /var/tmp/diff_new_pack.I2XK02/_old 2020-02-05 07:27:33.462699673 +0100 +++ /var/tmp/diff_new_pack.I2XK02/_new 2020-02-05 07:27:33.466699675 +0100 @@ -2,11 +2,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>3</version> - </parent> <groupId>bsf</groupId> <artifactId>bsf</artifactId> <version>2.4.0</version> ++++++ build-file.patch ++++++ --- /var/tmp/diff_new_pack.I2XK02/_old 2020-02-05 07:27:33.490699685 +0100 +++ /var/tmp/diff_new_pack.I2XK02/_new 2020-02-05 07:27:33.490699685 +0100 @@ -1,5 +1,6 @@ ---- bsf-2.4.0-orig/build.xml 2009-09-09 11:51:20.000000000 +0200 -+++ bsf-2.4.0/build.xml 2009-09-14 08:42:17.000000000 +0200 +diff -urEbwB bsf-2.4.0-orig/build.xml bsf-2.4.0/build.xml +--- bsf-2.4.0-orig/build.xml 2018-11-27 10:25:00.759233502 +0100 ++++ bsf-2.4.0/build.xml 2018-11-27 10:28:36.864365763 +0100 @@ -102,7 +102,7 @@ <pathelement location="${build.tests}"/> </path> @@ -9,9 +10,68 @@ <tstamp /> -@@ -134,11 +134,13 @@ - - <available property="junit.present" classname="junit.framework.TestCase" /> +@@ -122,23 +122,61 @@ + <!-- ================================================================= --> + <!-- Determines what optional components are available --> + <!-- ================================================================= --> +- <available property="jacl.present" classname="tcl.lang.JACL" /> +- +- <available property="jython.present" classname="org.python.util.jython" /> +- +- <available property="netrexx.present" classname="netrexx.lang.Rexx" /> +- +- <available property="rhino.present" classname="org.mozilla.javascript.Scriptable" /> +- +- <available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck" /> +- +- <available property="junit.present" classname="junit.framework.TestCase" /> ++ <available property="jacl.present" classname="tcl.lang.JACL"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> ++ ++ <available property="jython.present" classname="org.python.util.jython"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> ++ ++ <available property="netrexx.present" classname="netrexx.lang.Rexx"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> ++ ++ <available property="rhino.present" classname="org.mozilla.javascript.Scriptable"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> ++ ++ <available property="xalan.present" classname="org.apache.xalan.xslt.EnvironmentCheck"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> ++ ++ <available property="junit.present" classname="junit.framework.TestCase"> ++ <classpath> ++ <fileset dir="lib"> ++ <include name="*.jar"/> ++ </fileset> ++ </classpath> ++ </available> + <!-- <uptodate property="javac.notRequired" targetfile="${build.lib}/${project.name}.jar"> ++++++ build.properties.patch ++++++ --- /var/tmp/diff_new_pack.I2XK02/_old 2020-02-05 07:27:33.498699688 +0100 +++ /var/tmp/diff_new_pack.I2XK02/_new 2020-02-05 07:27:33.498699688 +0100 @@ -35,7 +35,7 @@ + <property name="site.dest" location="docs"/> + <property name="site.projectFile" value="stylesheets/project.xml"/> + -+ <property name="source.level" value="1.6" /> ++ <property name="source.level" value="8" /> + + <property name="src.dir" value="src"/> +
