Hello community,
here is the log from the commit of package bsf for openSUSE:Factory checked in
at 2017-09-27 16:49:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bsf (Old)
and /work/SRC/openSUSE:Factory/.bsf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsf"
Wed Sep 27 16:49:16 2017 rev:25 rq:527619 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/bsf/bsf.changes 2017-09-13 22:25:24.509222813
+0200
+++ /work/SRC/openSUSE:Factory/.bsf.new/bsf.changes 2017-09-27
16:49:19.134008436 +0200
@@ -1,0 +2,7 @@
+Wed Sep 20 20:32:46 UTC 2017 - fst...@suse.com
+
+- Fix javadoc errors with jdk9: use build-jar-repository instead
+ of system-wide CLASSPATH environmental variable
+- Clean spec file and run fdupes on documentation
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bsf.spec ++++++
--- /var/tmp/diff_new_pack.DsaMp9/_old 2017-09-27 16:49:19.701928516 +0200
+++ /var/tmp/diff_new_pack.DsaMp9/_new 2017-09-27 16:49:19.709927391 +0200
@@ -31,6 +31,7 @@
Patch1: build.properties.patch
BuildRequires: ant
BuildRequires: apache-commons-logging
+BuildRequires: fdupes
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
@@ -38,7 +39,6 @@
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
BuildArch: noarch
-BuildConflicts: java-devel >= 1.9
%description
Bean Scripting Framework (BSF) is a set of Java classes that provides
@@ -91,11 +91,9 @@
%patch1 -p1
%build
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2
servlet jspapi)
-ant jar
-rm -rf bsf/src/org/apache/bsf/engines/java
-ant javadocs
+mkdir -p lib
+build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2
+%{ant} jar javadocs
%install
# jar
@@ -110,6 +108,7 @@
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
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
